diff options
author | Jiri Kosina <jkosina@suse.cz> | 2007-07-09 08:23:37 -0400 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2007-07-09 08:23:37 -0400 |
commit | feb485d4010e450183bd422d90c0d0f6be98f932 (patch) | |
tree | 6c6b14d67b81fe98d6bee658c0caaffefae6b789 /drivers/hid/Kconfig | |
parent | 58037eb961f859607b161c50d9d4ecb374de1e8f (diff) | |
parent | 2c1d8aea2ca76df1b1de2aed23e3ceda2a044ed1 (diff) |
Merge branches 'debug-module-param' and 'upstream' into for-linus
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r-- | drivers/hid/Kconfig | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 5b004b2b1a4e..3b63b0b78122 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
@@ -1,8 +1,12 @@ | |||
1 | # | 1 | # |
2 | # HID driver configuration | 2 | # HID driver configuration |
3 | # | 3 | # |
4 | menu "HID Devices" | 4 | menuconfig HID_SUPPORT |
5 | bool "HID Devices" | ||
5 | depends on INPUT | 6 | depends on INPUT |
7 | default y | ||
8 | |||
9 | if HID_SUPPORT | ||
6 | 10 | ||
7 | config HID | 11 | config HID |
8 | tristate "Generic HID support" | 12 | tristate "Generic HID support" |
@@ -39,5 +43,4 @@ config HID_DEBUG | |||
39 | 43 | ||
40 | source "drivers/hid/usbhid/Kconfig" | 44 | source "drivers/hid/usbhid/Kconfig" |
41 | 45 | ||
42 | endmenu | 46 | endif # HID_SUPPORT |
43 | |||