diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-10 21:10:34 -0500 |
| commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
| tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /drivers/mfd | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
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 4b364bae6b3e..970afa103261 100644 --- a/drivers/mfd/menelaus.c +++ b/drivers/mfd/menelaus.c | |||
| @@ -44,7 +44,7 @@ | |||
| 44 | #include <asm/mach/irq.h> | 44 | #include <asm/mach/irq.h> |
| 45 | 45 | ||
| 46 | #include <mach/gpio.h> | 46 | #include <mach/gpio.h> |
| 47 | #include <mach/menelaus.h> | 47 | #include <plat/menelaus.h> |
| 48 | 48 | ||
| 49 | #define DRIVER_NAME "menelaus" | 49 | #define DRIVER_NAME "menelaus" |
| 50 | 50 | ||
diff --git a/drivers/mfd/twl4030-core.c b/drivers/mfd/twl4030-core.c index a1c47ee95c0e..6cb12502e306 100644 --- a/drivers/mfd/twl4030-core.c +++ b/drivers/mfd/twl4030-core.c | |||
| @@ -39,7 +39,7 @@ | |||
| 39 | #include <linux/i2c/twl4030.h> | 39 | #include <linux/i2c/twl4030.h> |
| 40 | 40 | ||
| 41 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) | 41 | #if defined(CONFIG_ARCH_OMAP2) || defined(CONFIG_ARCH_OMAP3) |
| 42 | #include <mach/cpu.h> | 42 | #include <plat/cpu.h> |
| 43 | #endif | 43 | #endif |
| 44 | 44 | ||
| 45 | /* | 45 | /* |