浏览代码

mfd: Several MFD drivers should depend on GENERIC_HARDIRQS

commit 5fb4d38b19d95a5f980f0a10adba798f5b92128c ("mfd: Move WM831x to
generic IRQ") didn't take into account that genirq support depends on
GENERIC_HARDIRQS.

Additionally, 2.6.34-rc1 added:
  - commit 2afa62ea76027b00e472ddb672191e6e15425b43 ("mfd: Use genirq in
    88pm860x").
  - commit 760e4518788df6762700e6bb9dd8692379f11168 ("mfd: Convert WM8350 to
    genirq").
  - commit 1f1cf8f98cf6588365efeaab8e7e7758aaa77f6e ("mfd: Update irq handler
    in max8925")

Make all of them depend on GENERIC_HARDIRQS to avoid compile errors on
architectures that don't support genirq yet.

Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Mark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>
Geert Uytterhoeven 16 年之前
父节点
当前提交
8d002bdc9f
共有 1 个文件被更改,包括 5 次插入4 次删除
  1. 5 4
      drivers/mfd/Kconfig

+ 5 - 4
drivers/mfd/Kconfig

@@ -11,7 +11,7 @@ config MFD_CORE
 
 
 config MFD_88PM860X
 config MFD_88PM860X
 	bool "Support Marvell 88PM8606/88PM8607"
 	bool "Support Marvell 88PM8606/88PM8607"
-	depends on I2C=y
+	depends on I2C=y && GENERIC_HARDIRQS
 	select MFD_CORE
 	select MFD_CORE
 	help
 	help
 	  This supports for Marvell 88PM8606/88PM8607 Power Management IC.
 	  This supports for Marvell 88PM8606/88PM8607 Power Management IC.
@@ -205,7 +205,7 @@ config PMIC_ADP5520
 
 
 config MFD_MAX8925
 config MFD_MAX8925
 	bool "Maxim Semiconductor MAX8925 PMIC Support"
 	bool "Maxim Semiconductor MAX8925 PMIC Support"
-	depends on I2C=y
+	depends on I2C=y && GENERIC_HARDIRQS
 	select MFD_CORE
 	select MFD_CORE
 	help
 	help
 	  Say yes here to support for Maxim Semiconductor MAX8925. This is
 	  Say yes here to support for Maxim Semiconductor MAX8925. This is
@@ -226,7 +226,7 @@ config MFD_WM8400
 config MFD_WM831X
 config MFD_WM831X
 	bool "Support Wolfson Microelectronics WM831x/2x PMICs"
 	bool "Support Wolfson Microelectronics WM831x/2x PMICs"
 	select MFD_CORE
 	select MFD_CORE
-	depends on I2C=y
+	depends on I2C=y && GENERIC_HARDIRQS
 	help
 	help
 	  Support for the Wolfson Microelecronics WM831x and WM832x PMICs.
 	  Support for the Wolfson Microelecronics WM831x and WM832x PMICs.
 	  This driver provides common support for accessing the device,
 	  This driver provides common support for accessing the device,
@@ -235,6 +235,7 @@ config MFD_WM831X
 
 
 config MFD_WM8350
 config MFD_WM8350
 	bool
 	bool
+	depends on GENERIC_HARDIRQS
 
 
 config MFD_WM8350_CONFIG_MODE_0
 config MFD_WM8350_CONFIG_MODE_0
 	bool
 	bool
@@ -287,7 +288,7 @@ config MFD_WM8352_CONFIG_MODE_3
 config MFD_WM8350_I2C
 config MFD_WM8350_I2C
 	bool "Support Wolfson Microelectronics WM8350 with I2C"
 	bool "Support Wolfson Microelectronics WM8350 with I2C"
 	select MFD_WM8350
 	select MFD_WM8350
-	depends on I2C=y
+	depends on I2C=y && GENERIC_HARDIRQS
 	help
 	help
 	  The WM8350 is an integrated audio and power management
 	  The WM8350 is an integrated audio and power management
 	  subsystem with watchdog and RTC functionality for embedded
 	  subsystem with watchdog and RTC functionality for embedded