diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 10:31:38 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-09-13 10:31:38 -0400 |
commit | 399a946edbbe90bd03aec2e93ce58c9b3f18e70b (patch) | |
tree | b467f7225be817a6ee7cf7e3c64518825dfec4f1 /drivers/usb/host/Kconfig | |
parent | 183c420323a9e45af0d995d7cbf416221698cbe4 (diff) | |
parent | 0244ad004a54e39308d495fee0a2e637f8b5c317 (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/usb/host/Kconfig')
-rw-r--r-- | drivers/usb/host/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig index 5be0326aae38..b3f20d7f15de 100644 --- a/drivers/usb/host/Kconfig +++ b/drivers/usb/host/Kconfig | |||
@@ -278,7 +278,6 @@ endif # USB_EHCI_HCD | |||
278 | 278 | ||
279 | config USB_OXU210HP_HCD | 279 | config USB_OXU210HP_HCD |
280 | tristate "OXU210HP HCD support" | 280 | tristate "OXU210HP HCD support" |
281 | depends on GENERIC_HARDIRQS | ||
282 | ---help--- | 281 | ---help--- |
283 | The OXU210HP is an USB host/OTG/device controller. Enable this | 282 | The OXU210HP is an USB host/OTG/device controller. Enable this |
284 | option if your board has this chip. If unsure, say N. | 283 | option if your board has this chip. If unsure, say N. |