Commit 63f3861d authored by Jiri Kosina's avatar Jiri Kosina Committed by Greg Kroah-Hartman
Browse files

[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: default avatarJiri Kosina <jkosina@suse.cz>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4c2ae844

CREDITS

+8 −0
Original line number Original line Diff line number Diff line
@@ -1808,6 +1808,14 @@ S: Kruislaan 419 
S: 1098 VA Amsterdam 

S: 1098 VA Amsterdam 

S: The Netherlands

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

N: Gene Kozin

E: 74604.152@compuserve.com

E: 74604.152@compuserve.com

W: http://www.sangoma.com

W: http://www.sangoma.com

drivers/Kconfig

+2 −0
Original line number Original line Diff line number Diff line
@@ -64,6 +64,8 @@ source "drivers/video/Kconfig" 




source "sound/Kconfig"

source "sound/Kconfig"





source "drivers/hid/Kconfig"



source "drivers/usb/Kconfig"

source "drivers/usb/Kconfig"





source "drivers/mmc/Kconfig"

source "drivers/mmc/Kconfig"

drivers/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -77,4 +77,5 @@ obj-$(CONFIG_CRYPTO) += crypto/ 
obj-$(CONFIG_SUPERH)		+= sh/

obj-$(CONFIG_SUPERH)		+= sh/

obj-$(CONFIG_GENERIC_TIME)	+= clocksource/

obj-$(CONFIG_GENERIC_TIME)	+= clocksource/

obj-$(CONFIG_DMA_ENGINE)	+= dma/

obj-$(CONFIG_DMA_ENGINE)	+= dma/

obj-$(CONFIG_HID)		+= hid/

obj-$(CONFIG_PPC_PS3)		+= ps3/
 
obj-$(CONFIG_PPC_PS3)		+= ps3/

drivers/hid/Kconfig

0 → 100644
+18 −0
Original line number Original line Diff line number Diff line 
#

# 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

drivers/hid/Makefile

0 → 100644
+15 −0
Original line number Original line Diff line number Diff line 
#

# 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

CRA Git | Maintained and supported by SUSTech CRA and CCSE