diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2012-07-15 10:24:53 +0200 |
commit | e8b9dd7e2471b1274e3be719fcc385e0a710e46f (patch) | |
tree | 030d7ce20e8f8767d9423f78c102aba089eec372 /net/bluetooth/hidp/Kconfig | |
parent | 924412f66fd9d21212e560a93792b0b607d46c6e (diff) | |
parent | 6b1859dba01c7d512b72d77e3fd7da8354235189 (diff) | |
download | linux-e8b9dd7e2471b1274e3be719fcc385e0a710e46f.tar.gz |
Merge branch 'timers/urgent' into timers/core
Reason: Update to upstream changes to avoid further conflicts. Fixup a trivial merge conflict in kernel/time/tick-sched.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'net/bluetooth/hidp/Kconfig')
-rw-r--r-- | net/bluetooth/hidp/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/bluetooth/hidp/Kconfig b/net/bluetooth/hidp/Kconfig index 4deaca78e91e..9332bc7aa851 100644 --- a/net/bluetooth/hidp/Kconfig +++ b/net/bluetooth/hidp/Kconfig @@ -1,6 +1,6 @@ config BT_HIDP tristate "HIDP protocol support" - depends on BT && INPUT && HID_SUPPORT + depends on BT && INPUT select HID help HIDP (Human Interface Device Protocol) is a transport layer |