diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-11 02:10:34 (GMT) |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-11 02:10:34 (GMT) |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /drivers/mfd | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
| download | linux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.xz | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'drivers/mfd')
| -rw-r--r-- | drivers/mfd/menelaus.c | 2 | ||||
| -rw-r--r-- | drivers/mfd/twl4030-core.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/mfd/menelaus.c b/drivers/mfd/menelaus.c index 4b364ba..970afa1 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c @@ -44,7 +44,7 @@ #include <asm/mach/irq.h> #include <mach/gpio.h> -#include <mach/menelaus.h> +#include <plat/menelaus.h> #define DRIVER_NAME "menelaus" diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index a1c47ee..6cb1250 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c @@ -39,7 +39,7 @@ #include <linux/i2c/twl4030.h> #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) -#include <mach/cpu.h> +#include <plat/cpu.h> #endif /* |