[PATCH] Generic HID layer - build

This modifies Makefiles and Kconfigs to properly reflect the creation of
generic HID layer.

It also removes the dependency of BROKEN, which was introduced by the
first patch in series (see the comment). Also updates credits.

Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/CREDITS b/CREDITS
index d0880082c19bda5b25a8a51df7849af2ec55aac5..8218e790f43d33d2c754df8f149b56ef7c19b816 100644 (file)
--- a/CREDITS
+++ b/CREDITS
@@ -1808,6 +1808,14 @@ S: Kruislaan 419
 S: 1098 VA Amsterdam 
 S: The Netherlands
 
+N: Jiri Kosina
+E: jikos@jikos.cz
+E: jkosina@suse.cz
+D: Generic HID layer - original code split, fixes
+D: Various ACPI fixes, keeping correct battery state through suspend
+D: various lockdep annotations, autofs and other random bugfixes
+S: Prague, Czech Republic
+
 N: Gene Kozin
 E: 74604.152@compuserve.com
 W: http://www.sangoma.com

diff --git a/drivers/Kconfig b/drivers/Kconfig
index f39463418904f0777e105911edfec32b0331dc7a..4929e923b5c6fa15632cd45afd4e4df62b294ef6 100644 (file)
--- a/drivers/Kconfig
+++ b/drivers/Kconfig
@@ -64,6 +64,8 @@ source "drivers/video/Kconfig"
 
 source "sound/Kconfig"
 
+source "drivers/hid/Kconfig"
+
 source "drivers/usb/Kconfig"
 
 source "drivers/mmc/Kconfig"

diff --git a/drivers/Makefile b/drivers/Makefile
index 67711770b1d9c53d95746db422f6b711c8857a2c..50f76da598c95f67d86d7097c57fa2b03ee08909 100644 (file)
--- a/drivers/Makefile
+++ b/drivers/Makefile
@@ -77,4 +77,5 @@ obj-$(CONFIG_CRYPTO)          += crypto/
 obj-$(CONFIG_SUPERH)           += sh/
 obj-$(CONFIG_GENERIC_TIME)     += clocksource/
 obj-$(CONFIG_DMA_ENGINE)       += dma/
+obj-$(CONFIG_HID)              += hid/
 obj-$(CONFIG_PPC_PS3)          += ps3/

diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
new file mode 100644 (file)
index 0000000..96d4a0b
--- /dev/null
+++ b/drivers/hid/Kconfig
@@ -0,0 +1,18 @@
+#
+# HID driver configuration
+#
+menu "HID Devices"
+       depends on INPUT
+
+config HID
+       tristate "Generic HID support"
+       default y
+       ---help---
+         Say Y here if you want generic HID support to connect keyboards,
+         mice, joysticks, graphic tablets, or any other HID based devices
+         to your computer. You also need to select particular types of
+         HID devices you want to compile support for, in the particular
+         driver menu (USB, Bluetooth)
+
+endmenu
+

diff --git a/drivers/hid/Makefile b/drivers/hid/Makefile
new file mode 100644 (file)
index 0000000..6432392
--- /dev/null
+++ b/drivers/hid/Makefile
@@ -0,0 +1,15 @@
+#
+# Makefile for the HID driver
+#
+
+# Multipart objects.
+hid-objs       := hid-core.o hid-input.o
+
+# Optional parts of multipart objects.
+
+obj-$(CONFIG_HID)              += hid.o
+
+ifeq ($(CONFIG_INPUT_DEBUG),y)
+EXTRA_CFLAGS += -DDEBUG
+endif
+

diff --git a/drivers/input/Makefile b/drivers/input/Makefile
index a005b1df5f1a57ddc32be556f8c503d8f4f7a4fa..da575deb3c7a690872f61a239070e5424ee74a19 100644 (file)
--- a/drivers/input/Makefile
+++ b/drivers/input/Makefile
@@ -21,3 +21,4 @@ obj-$(CONFIG_INPUT_MOUSE)     += mouse/
 obj-$(CONFIG_INPUT_JOYSTICK)   += joystick/
 obj-$(CONFIG_INPUT_TOUCHSCREEN)        += touchscreen/
 obj-$(CONFIG_INPUT_MISC)       += misc/
+

diff --git a/drivers/usb/input/Kconfig b/drivers/usb/input/Kconfig
index 9b075319ed5ecf0bcb4ff89995373443569d019f..8a62d4785755ef38319372611aeed6a040d89d3a 100644 (file)
--- a/drivers/usb/input/Kconfig
+++ b/drivers/usb/input/Kconfig
@@ -6,9 +6,10 @@ comment "USB Input Devices"
 
 config USB_HID
        tristate "USB Human Interface Device (full HID) support"
-       depends on USB && BROKEN
+       default y
+       depends on USB && HID
        ---help---
-         Say Y here if you want full HID support to connect keyboards,
+         Say Y here if you want full HID support to connect USB keyboards,
          mice, joysticks, graphic tablets, or any other HID based devices
          to your computer via USB. You also need to select HID Input layer
          support (below) if you want to use keyboards, mice, joysticks and
@@ -27,20 +28,10 @@ config USB_HID
 comment "Input core support is needed for USB HID input layer or HIDBP support"
        depends on USB_HID && INPUT=n
 
-config USB_HIDINPUT
-       bool "HID input layer support"
-       default y
-       depends on INPUT && USB_HID
-       help
-         Say Y here if you want to use a USB keyboard, mouse or joystick,
-         or any other HID input device.
-
-         If unsure, say Y.
-
-config USB_HIDINPUT_POWERBOOK
+config USB_HID_POWERBOOK
        bool "Enable support for iBook/PowerBook special keys"
        default n
-       depends on USB_HIDINPUT
+       depends on USB_HID
        help
          Say Y here if you want support for the special keys (Fn, Numlock) on
          Apple iBooks and PowerBooks.
@@ -49,7 +40,7 @@ config USB_HIDINPUT_POWERBOOK
 
 config HID_FF
        bool "Force feedback support (EXPERIMENTAL)"
-       depends on USB_HIDINPUT && EXPERIMENTAL
+       depends on USB_HID && EXPERIMENTAL
        help
          Say Y here is you want force feedback support for a few HID devices.
          See below for a list of supported devices.

diff --git a/drivers/usb/input/Makefile b/drivers/usb/input/Makefile
index d946d5213b30d0481035406caf1ada2101f178f7..1a24b5bfa05fcd493adecc2822e3aab0fe862c62 100644 (file)
--- a/drivers/usb/input/Makefile
+++ b/drivers/usb/input/Makefile
@@ -11,9 +11,6 @@ usbhid-objs   := hid-core.o
 ifeq ($(CONFIG_USB_HIDDEV),y)
        usbhid-objs     += hiddev.o
 endif
-ifeq ($(CONFIG_USB_HIDINPUT),y)
-       usbhid-objs     += hid-input.o
-endif
 ifeq ($(CONFIG_HID_PID),y)
        usbhid-objs     += hid-pidff.o
 endif