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 /arch/arm/mach-omap2/mmc-twl4030.c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/mmc-twl4030.c')
| -rw-r--r-- | arch/arm/mach-omap2/mmc-twl4030.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index c9c59a2db4e2..340391468909 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c | |||
| @@ -20,9 +20,9 @@ | |||
| 20 | #include <linux/regulator/consumer.h> | 20 | #include <linux/regulator/consumer.h> |
| 21 | 21 | ||
| 22 | #include <mach/hardware.h> | 22 | #include <mach/hardware.h> |
| 23 | #include <mach/control.h> | 23 | #include <plat/control.h> |
| 24 | #include <mach/mmc.h> | 24 | #include <plat/mmc.h> |
| 25 | #include <mach/board.h> | 25 | #include <plat/board.h> |
| 26 | 26 | ||
| 27 | #include "mmc-twl4030.h" | 27 | #include "mmc-twl4030.h" |
| 28 | 28 | ||