---

yaml --- r: 355066 b: refs/heads/master c: e1e0a9e h: refs/heads/master v: v3
git-mirror · Feb 8, 2013 · e763046 · e763046
1 parent 41f26c3
commit e763046
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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