aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2009-12-15 15:49:57 -0500
committerSamuel Ortiz <sameo@linux.intel.com>2010-03-12 03:09:00 -0500
commit8d002bdc9f1f9a1220c0d87a7321f0233ace97cd (patch)
tree48820ea92d6c3c186d0e95dad216dd7b0ad414c2 /drivers
parenta5300dcbbd5d455a1a5978095b8f78af66c540a6 (diff)
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/mfd/Kconfig9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index 951fa9b93fbe..2a5a0b78f84e 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -11,7 +11,7 @@ config MFD_CORE
11 11
12config MFD_88PM860X 12config MFD_88PM860X
13 bool "Support Marvell 88PM8606/88PM8607" 13 bool "Support Marvell 88PM8606/88PM8607"
14 depends on I2C=y 14 depends on I2C=y && GENERIC_HARDIRQS
15 select MFD_CORE 15 select MFD_CORE
16 help 16 help
17 This supports for Marvell 88PM8606/88PM8607 Power Management IC. 17 This supports for Marvell 88PM8606/88PM8607 Power Management IC.
@@ -205,7 +205,7 @@ config PMIC_ADP5520
205 205
206config MFD_MAX8925 206config MFD_MAX8925
207 bool "Maxim Semiconductor MAX8925 PMIC Support" 207 bool "Maxim Semiconductor MAX8925 PMIC Support"
208 depends on I2C=y 208 depends on I2C=y && GENERIC_HARDIRQS
209 select MFD_CORE 209 select MFD_CORE
210 help 210 help
211 Say yes here to support for Maxim Semiconductor MAX8925. This is 211 Say yes here to support for Maxim Semiconductor MAX8925. This is
@@ -226,7 +226,7 @@ config MFD_WM8400
226config MFD_WM831X 226config MFD_WM831X
227 bool "Support Wolfson Microelectronics WM831x/2x PMICs" 227 bool "Support Wolfson Microelectronics WM831x/2x PMICs"
228 select MFD_CORE 228 select MFD_CORE
229 depends on I2C=y 229 depends on I2C=y && GENERIC_HARDIRQS
230 help 230 help
231 Support for the Wolfson Microelecronics WM831x and WM832x PMICs. 231 Support for the Wolfson Microelecronics WM831x and WM832x PMICs.
232 This driver provides common support for accessing the device, 232 This driver provides common support for accessing the device,
@@ -235,6 +235,7 @@ config MFD_WM831X
235 235
236config MFD_WM8350 236config MFD_WM8350
237 bool 237 bool
238 depends on GENERIC_HARDIRQS
238 239
239config MFD_WM8350_CONFIG_MODE_0 240config MFD_WM8350_CONFIG_MODE_0
240 bool 241 bool
@@ -287,7 +288,7 @@ config MFD_WM8352_CONFIG_MODE_3
287config MFD_WM8350_I2C 288config MFD_WM8350_I2C
288 bool "Support Wolfson Microelectronics WM8350 with I2C" 289 bool "Support Wolfson Microelectronics WM8350 with I2C"
289 select MFD_WM8350 290 select MFD_WM8350
290 depends on I2C=y 291 depends on I2C=y && GENERIC_HARDIRQS
291 help 292 help
292 The WM8350 is an integrated audio and power management 293 The WM8350 is an integrated audio and power management
293 subsystem with watchdog and RTC functionality for embedded 294 subsystem with watchdog and RTC functionality for embedded