From 4551bfe0dcf9b18af8b1e1d3e3c71ae396e534f2 Mon Sep 17 00:00:00 2001 From: Geert Uytterhoeven Date: Tue, 15 Dec 2009 21:49:57 +0100 Subject: [PATCH] --- yaml --- r: 187815 b: refs/heads/master c: 8d002bdc9f1f9a1220c0d87a7321f0233ace97cd h: refs/heads/master i: 187813: 797e9a82612b909a961ce8a2140e5474ff50b3db 187811: 0401d13c98071d2b4397a0e2cfea231ec632f376 187807: 0e8d997deb9aeeb73cd99c5b36be1cc8f4c7067f v: v3 --- [refs] | 2 +- trunk/drivers/mfd/Kconfig | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 361aa25121fc..5bae9f4ec969 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5300dcbbd5d455a1a5978095b8f78af66c540a6 +refs/heads/master: 8d002bdc9f1f9a1220c0d87a7321f0233ace97cd diff --git a/trunk/drivers/mfd/Kconfig b/trunk/drivers/mfd/Kconfig index 951fa9b93fbe..2a5a0b78f84e 100644 --- a/trunk/drivers/mfd/Kconfig +++ b/trunk/drivers/mfd/Kconfig @@ -11,7 +11,7 @@ config MFD_CORE config MFD_88PM860X bool "Support Marvell 88PM8606/88PM8607" - depends on I2C=y + depends on I2C=y && GENERIC_HARDIRQS select MFD_CORE help This supports for Marvell 88PM8606/88PM8607 Power Management IC. @@ -205,7 +205,7 @@ config PMIC_ADP5520 config MFD_MAX8925 bool "Maxim Semiconductor MAX8925 PMIC Support" - depends on I2C=y + depends on I2C=y && GENERIC_HARDIRQS select MFD_CORE help Say yes here to support for Maxim Semiconductor MAX8925. This is @@ -226,7 +226,7 @@ config MFD_WM8400 config MFD_WM831X bool "Support Wolfson Microelectronics WM831x/2x PMICs" select MFD_CORE - depends on I2C=y + depends on I2C=y && GENERIC_HARDIRQS help Support for the Wolfson Microelecronics WM831x and WM832x PMICs. This driver provides common support for accessing the device, @@ -235,6 +235,7 @@ config MFD_WM831X config MFD_WM8350 bool + depends on GENERIC_HARDIRQS config MFD_WM8350_CONFIG_MODE_0 bool @@ -287,7 +288,7 @@ config MFD_WM8352_CONFIG_MODE_3 config MFD_WM8350_I2C bool "Support Wolfson Microelectronics WM8350 with I2C" select MFD_WM8350 - depends on I2C=y + depends on I2C=y && GENERIC_HARDIRQS help The WM8350 is an integrated audio and power management subsystem with watchdog and RTC functionality for embedded