diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2008-12-22 22:52:14 +0100 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2008-12-22 22:52:14 +0100 |
| commit | 9d8b1ab0eb04126e2b78c06a39e6013321973b19 (patch) | |
| tree | ebaabc8a4f5b02a60ab3bf39cc8251f10863e8e1 /drivers | |
| parent | a3e1b37e170c89512a2e0b51da196e0d1b482c34 (diff) | |
| parent | b55b52f2b19c1a5fb67d19dd9242ff617bc9f083 (diff) | |
Merge branch 'upstream' into for-next
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hid/usbhid/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/usbhid/Kconfig b/drivers/hid/usbhid/Kconfig index 5d9aa95fc3ef..4edb3bef94a6 100644 --- a/drivers/hid/usbhid/Kconfig +++ b/drivers/hid/usbhid/Kconfig @@ -45,7 +45,7 @@ config USB_HIDDEV If unsure, say Y. menu "USB HID Boot Protocol drivers" - depends on USB!=n && USB_HID!=y + depends on USB!=n && USB_HID!=y && EMBEDDED config USB_KBD tristate "USB HIDBP Keyboard (simple Boot) support" |