diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:32:31 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:32:31 +0200 |
| commit | 56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch) | |
| tree | 195cdd3973a1288eb84f51f0ec28a947b333c2c5 /drivers/hid/Kconfig | |
| parent | b3d07e0344ea36dd3f3a2fdbfaab883e1c5ca69e (diff) | |
| parent | d1257081aecf44455fcab8675f1d54e8b242faa1 (diff) | |
| download | linux-3.10-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.gz linux-3.10-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.bz2 linux-3.10-56ccd186f1837dd418cd094f0e96b3196bbab9ef.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index 9a581e1a190..80175c37a6a 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig @@ -104,6 +104,12 @@ config HID_APPLE Say Y here if you want support for keyboards of Apple iBooks, PowerBooks, MacBooks, MacBook Pros and Apple Aluminum. +config HID_AUREAL + tristate "Aureal" + depends on USB_HID + ---help--- + Support for Aureal Cy se W-01RN Remote Controller and other Aureal derived remotes. + config HID_BELKIN tristate "Belkin Flip KVM and Wireless keyboard" if EXPERT depends on USB_HID |