Skip to content

Commit 471d171

Browse files
bentissdtor
authored andcommitted
Input: wacom - move the USB (now hid) Wacom driver in drivers/hid
wacom.ko is now a full HID driver, we have to move it into the proper subdirectory: drivers/hid. Signed-off-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
1 parent a3e6f65 commit 471d171

File tree

8 files changed

+16
-19
lines changed

8 files changed

+16
-19
lines changed

Diff for: drivers/hid/Kconfig

+13
Original file line numberDiff line numberDiff line change
@@ -755,6 +755,19 @@ config HID_WACOM
755755
---help---
756756
Support for Wacom Graphire Bluetooth and Intuos4 WL tablets.
757757

758+
config HID_USB_WACOM
759+
tristate "Wacom Intuos/Graphire tablet support (USB)"
760+
depends on HID
761+
select POWER_SUPPLY
762+
select NEW_LEDS
763+
select LEDS_CLASS
764+
help
765+
Say Y here if you want to use the USB version of the Wacom Intuos
766+
or Graphire tablet.
767+
768+
To compile this driver as a module, choose M here: the
769+
module will be called wacom.
770+
758771
config HID_WIIMOTE
759772
tristate "Nintendo Wii / Wii U peripherals"
760773
depends on HID

Diff for: drivers/hid/Makefile

+3
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,9 @@ obj-$(CONFIG_HID_XINMO) += hid-xinmo.o
116116
obj-$(CONFIG_HID_ZEROPLUS) += hid-zpff.o
117117
obj-$(CONFIG_HID_ZYDACRON) += hid-zydacron.o
118118
obj-$(CONFIG_HID_WACOM) += hid-wacom.o
119+
120+
wacom-objs := wacom_wac.o wacom_sys.o
121+
obj-$(CONFIG_HID_USB_WACOM) += wacom.o
119122
obj-$(CONFIG_HID_WALTOP) += hid-waltop.o
120123
obj-$(CONFIG_HID_WIIMOTE) += hid-wiimote.o
121124
obj-$(CONFIG_HID_SENSOR_HUB) += hid-sensor-hub.o
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

Diff for: drivers/input/tablet/Kconfig

-16
Original file line numberDiff line numberDiff line change
@@ -73,20 +73,4 @@ config TABLET_USB_KBTAB
7373
To compile this driver as a module, choose M here: the
7474
module will be called kbtab.
7575

76-
config TABLET_USB_WACOM
77-
tristate "Wacom Intuos/Graphire tablet support (USB)"
78-
depends on USB_ARCH_HAS_HCD
79-
select POWER_SUPPLY
80-
select USB
81-
select NEW_LEDS
82-
select LEDS_CLASS
83-
help
84-
Say Y here if you want to use the USB version of the Wacom Intuos
85-
or Graphire tablet. Make sure to say Y to "Mouse support"
86-
(CONFIG_INPUT_MOUSEDEV) and/or "Event interface support"
87-
(CONFIG_INPUT_EVDEV) as well.
88-
89-
To compile this driver as a module, choose M here: the
90-
module will be called wacom.
91-
9276
endif

Diff for: drivers/input/tablet/Makefile

-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,9 @@
22
# Makefile for the tablet drivers
33
#
44

5-
# Multipart objects.
6-
wacom-objs := wacom_wac.o wacom_sys.o
75

86
obj-$(CONFIG_TABLET_USB_ACECAD) += acecad.o
97
obj-$(CONFIG_TABLET_USB_AIPTEK) += aiptek.o
108
obj-$(CONFIG_TABLET_USB_GTCO) += gtco.o
119
obj-$(CONFIG_TABLET_USB_HANWANG) += hanwang.o
1210
obj-$(CONFIG_TABLET_USB_KBTAB) += kbtab.o
13-
obj-$(CONFIG_TABLET_USB_WACOM) += wacom.o

0 commit comments

Comments
 (0)