diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 16:27:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-12 16:27:24 -0800 |
| commit | b743791639d8142277df1c2814c282e3ad752f06 (patch) | |
| tree | 27e09f48e6c28b8695c343dbd3d8dedb0a92b3a4 /drivers/mfd/twl4030-core.c | |
| parent | 9219a3b9889dbc7dae68e472f239672ff48860b0 (diff) | |
| parent | b29c06ae96acc47e866f29d19075707f91df69c8 (diff) | |
Merge branch 'for-next' of git://git.o-hand.com/linux-mfd
* 'for-next' of git://git.o-hand.com/linux-mfd:
mfd: Fix twl4030-core build
mfd: Ensure sm501 GPIO pin mode is GPIO when configured
mfd: dm355 evm MMC/SD card detection
regulator: PCF50633 pmic driver
input: PCF50633 input driver
power_supply: PCF50633 battery charger driver
rtc: PCF50633 rtc driver
mfd: PCF50633 gpio support
mfd: PCF50633 adc driver
mfd: PCF50633 core driver
Diffstat (limited to 'drivers/mfd/twl4030-core.c')
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index b59c385cbc1..074b11ffbf4 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -38,6 +38,9 @@ #include <linux/i2c.h> #include <linux/i2c/twl4030.h> +#ifdef CONFIG_ARM +#include <mach/cpu.h> +#endif /* * The TWL4030 "Triton 2" is one of a family of a multi-function "Power |