diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-02-06 11:23:56 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-02-08 15:23:53 -0500 |
commit | e1e0a9e6991ec2c611f13dfc0a6bc1a214a22374 (patch) | |
tree | eb4873cf9c032b1ac32cba4606f7c2e5d6633eb8 | |
parent | 3d55399391c8ecb5bb3d1c426bafa2580a889c4e (diff) |
drivers/misc/cb710: add missing GENERIC_HARDIRQS dependency
CB710_CORE (drivers/misc/cb710/core.c) calls devm_request_irq() and
therefore needs a GENERIC_HARDIRQS dependency to prevent a link
error on s390.
Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r-- | drivers/misc/cb710/Kconfig | 2 | ||||
-rw-r--r-- | drivers/mmc/host/Kconfig | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/misc/cb710/Kconfig b/drivers/misc/cb710/Kconfig index 22429b8b1068..5acb9c5b49c4 100644 --- a/drivers/misc/cb710/Kconfig +++ b/drivers/misc/cb710/Kconfig | |||
@@ -1,6 +1,6 @@ | |||
1 | config CB710_CORE | 1 | config CB710_CORE |
2 | tristate "ENE CB710/720 Flash memory card reader support" | 2 | tristate "ENE CB710/720 Flash memory card reader support" |
3 | depends on PCI | 3 | depends on PCI && GENERIC_HARDIRQS |
4 | help | 4 | help |
5 | This option enables support for PCI ENE CB710/720 Flash memory card | 5 | This option enables support for PCI ENE CB710/720 Flash memory card |
6 | reader found in some laptops (ie. some versions of HP Compaq nx9500). | 6 | reader found in some laptops (ie. some versions of HP Compaq nx9500). |
diff --git a/drivers/mmc/host/Kconfig b/drivers/mmc/host/Kconfig index 8d13c6594520..30041272ab96 100644 --- a/drivers/mmc/host/Kconfig +++ b/drivers/mmc/host/Kconfig | |||
@@ -461,7 +461,7 @@ config MMC_SDHI | |||
461 | 461 | ||
462 | config MMC_CB710 | 462 | config MMC_CB710 |
463 | tristate "ENE CB710 MMC/SD Interface support" | 463 | tristate "ENE CB710 MMC/SD Interface support" |
464 | depends on PCI | 464 | depends on PCI && GENERIC_HARDIRQS |
465 | select CB710_CORE | 465 | select CB710_CORE |
466 | help | 466 | help |
467 | This option enables support for MMC/SD part of ENE CB710/720 Flash | 467 | This option enables support for MMC/SD part of ENE CB710/720 Flash |