summaryrefslogtreecommitdiff
path: root/drivers/hid/Kconfig
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-09-13 07:31:38 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2013-09-13 07:31:38 -0700
commit399a946edbbe90bd03aec2e93ce58c9b3f18e70b (patch)
treeb467f7225be817a6ee7cf7e3c64518825dfec4f1 /drivers/hid/Kconfig
parent183c420323a9e45af0d995d7cbf416221698cbe4 (diff)
parent0244ad004a54e39308d495fee0a2e637f8b5c317 (diff)
Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull generic hardirq option removal from Martin Schwidefsky: "All architectures now use generic hardirqs, s390 has been last to switch. With that the code under !CONFIG_GENERIC_HARDIRQS and the related HAVE_GENERIC_HARDIRQS and GENERIC_HARDIRQS config options can be removed. Yay!" * 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: Remove GENERIC_HARDIRQ config option
Diffstat (limited to 'drivers/hid/Kconfig')
-rw-r--r--drivers/hid/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hid/Kconfig b/drivers/hid/Kconfig
index 3d7c9f67b6d7..71b70e3a7a71 100644
--- a/drivers/hid/Kconfig
+++ b/drivers/hid/Kconfig
@@ -773,7 +773,7 @@ config HID_ZYDACRON
config HID_SENSOR_HUB
tristate "HID Sensors framework support"
- depends on HID && GENERIC_HARDIRQS
+ depends on HID
select MFD_CORE
default n
---help---