diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 08:37:51 -0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 08:37:51 -0400 |
| commit | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 (patch) | |
| tree | f245dd77a3dede97a80f8369d984334b56220752 /drivers/hid/Kconfig | |
| parent | fa2bd30159499f441125495ba8d9d57f646ea42a (diff) | |
| parent | 86e6b77eb7cf9ca2e9c7092b4dfd588f0a3307b6 (diff) | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'drivers/hid/Kconfig')
| -rw-r--r-- | drivers/hid/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig index bf0617e47b89..2af774ad1060 100644 --- a/drivers/hid/Kconfig +++ b/drivers/hid/Kconfig | |||
| @@ -307,7 +307,6 @@ config HID_LOGITECH | |||
| 307 | config HID_LOGITECH_DJ | 307 | config HID_LOGITECH_DJ |
| 308 | tristate "Logitech Unifying receivers full support" | 308 | tristate "Logitech Unifying receivers full support" |
| 309 | depends on HID_LOGITECH | 309 | depends on HID_LOGITECH |
| 310 | default m | ||
| 311 | ---help--- | 310 | ---help--- |
| 312 | Say Y if you want support for Logitech Unifying receivers and devices. | 311 | Say Y if you want support for Logitech Unifying receivers and devices. |
| 313 | Unifying receivers are capable of pairing up to 6 Logitech compliant | 312 | Unifying receivers are capable of pairing up to 6 Logitech compliant |