Skip to content

Commit

Permalink
[PATCH] Generic HID layer - build
Browse files Browse the repository at this point in the history
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 <[email protected]>
Signed-off-by: Marcel Holtmann <[email protected]>
Cc: Dmitry Torokhov <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
  • Loading branch information
Jiri Kosina authored and gregkh committed Dec 8, 2006
1 parent 4c2ae84 commit 63f3861
Show file tree
Hide file tree
Showing 8 changed files with 51 additions and 18 deletions.
8 changes: 8 additions & 0 deletions CREDITS
Original file line number Diff line number Diff line change
Expand Up @@ -1808,6 +1808,14 @@ S: Kruislaan 419
S: 1098 VA Amsterdam
S: The Netherlands

N: Jiri Kosina
E: [email protected]
E: [email protected]
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: [email protected]
W: http://www.sangoma.com
Expand Down
2 changes: 2 additions & 0 deletions drivers/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ source "drivers/video/Kconfig"

source "sound/Kconfig"

source "drivers/hid/Kconfig"

source "drivers/usb/Kconfig"

source "drivers/mmc/Kconfig"
Expand Down
1 change: 1 addition & 0 deletions drivers/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
18 changes: 18 additions & 0 deletions drivers/hid/Kconfig
Original file line number Diff line number Diff line change
@@ -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

15 changes: 15 additions & 0 deletions drivers/hid/Makefile
Original file line number Diff line number Diff line change
@@ -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

1 change: 1 addition & 0 deletions drivers/input/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,4 @@ obj-$(CONFIG_INPUT_MOUSE) += mouse/
obj-$(CONFIG_INPUT_JOYSTICK) += joystick/
obj-$(CONFIG_INPUT_TOUCHSCREEN) += touchscreen/
obj-$(CONFIG_INPUT_MISC) += misc/

21 changes: 6 additions & 15 deletions drivers/usb/input/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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.
Expand All @@ -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.
Expand Down
3 changes: 0 additions & 3 deletions drivers/usb/input/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 63f3861

Please sign in to comment.