From e7630468ea217a729c1dc18ade8a8adbb64459fb Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 6 Feb 2013 17:23:56 +0100 Subject: [PATCH] --- yaml --- r: 355066 b: refs/heads/master c: e1e0a9e6991ec2c611f13dfc0a6bc1a214a22374 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/misc/cb710/Kconfig | 2 +- trunk/drivers/mmc/host/Kconfig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 97e935914c85..e2313574061d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3d55399391c8ecb5bb3d1c426bafa2580a889c4e +refs/heads/master: e1e0a9e6991ec2c611f13dfc0a6bc1a214a22374 diff --git a/trunk/drivers/misc/cb710/Kconfig b/trunk/drivers/misc/cb710/Kconfig index 22429b8b1068..5acb9c5b49c4 100644 --- a/trunk/drivers/misc/cb710/Kconfig +++ b/trunk/drivers/misc/cb710/Kconfig @@ -1,6 +1,6 @@ config CB710_CORE tristate "ENE CB710/720 Flash memory card reader support" - depends on PCI + depends on PCI && GENERIC_HARDIRQS help This option enables support for PCI ENE CB710/720 Flash memory card reader found in some laptops (ie. some versions of HP Compaq nx9500). diff --git a/trunk/drivers/mmc/host/Kconfig b/trunk/drivers/mmc/host/Kconfig index 8d13c6594520..30041272ab96 100644 --- a/trunk/drivers/mmc/host/Kconfig +++ b/trunk/drivers/mmc/host/Kconfig @@ -461,7 +461,7 @@ config MMC_SDHI config MMC_CB710 tristate "ENE CB710 MMC/SD Interface support" - depends on PCI + depends on PCI && GENERIC_HARDIRQS select CB710_CORE help This option enables support for MMC/SD part of ENE CB710/720 Flash