diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:08:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-17 14:08:03 -0800 |
| commit | 7f302fe3173c61e0e4fcf0a6a906ae297225e3be (patch) | |
| tree | 728ff8571423c1bdebfcb1350c70a36ace5cfc8c /drivers/mfd/twl4030-core.c | |
| parent | 68cc8301b45dee5de275a477a60f77f5560c8ca0 (diff) | |
| parent | dcd9651ecd652a186dd9ad0dde76d43320b9c0a2 (diff) | |
Merge branch 'for-linus' of git://git.o-hand.com/linux-mfd
* 'for-linus' of git://git.o-hand.com/linux-mfd:
mfd: Fix sm501_register_gpio section mismatch
mfd: fix sm501 section mismatches
mfd: terminate pcf50633 i2c_device_id list
mfd: Ensure all WM8350 IRQs are masked at startup
mfd: fix htc-egpio iomem resource handling using resource_size
mfd: Fix TWL4030 build on some ARM variants
mfd: wm8350 tries reaches -1
mfd: Mark WM835x USB_SLV_500MA bit as accessible
mfd: Improve diagnostics for WM8350 ID register probe
mfd: Initialise WM8350 interrupts earlier
mfd: Fix egpio kzalloc return test
Diffstat (limited to 'drivers/mfd/twl4030-core.c')
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index e7ab0035d30..68826f1e36b 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -38,7 +38,7 @@ #include <linux/i2c.h> #include <linux/i2c/twl4030.h> -#ifdef CONFIG_ARM +#if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) #include <mach/cpu.h> #endif |