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/board-rx51-peripherals.c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap2/board-rx51-peripherals.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-rx51-peripherals.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap2/board-rx51-peripherals.c b/arch/arm/mach-omap2/board-rx51-peripherals.c index e34d96a825e3..cf4583a5d284 100644 --- a/arch/arm/mach-omap2/board-rx51-peripherals.c +++ b/arch/arm/mach-omap2/board-rx51-peripherals.c | |||
| @@ -22,14 +22,14 @@ | |||
| 22 | #include <linux/gpio.h> | 22 | #include <linux/gpio.h> |
| 23 | #include <linux/mmc/host.h> | 23 | #include <linux/mmc/host.h> |
| 24 | 24 | ||
| 25 | #include <mach/mcspi.h> | 25 | #include <plat/mcspi.h> |
| 26 | #include <mach/mux.h> | 26 | #include <plat/mux.h> |
| 27 | #include <mach/board.h> | 27 | #include <plat/board.h> |
| 28 | #include <mach/common.h> | 28 | #include <plat/common.h> |
| 29 | #include <mach/dma.h> | 29 | #include <plat/dma.h> |
| 30 | #include <mach/gpmc.h> | 30 | #include <plat/gpmc.h> |
| 31 | #include <mach/onenand.h> | 31 | #include <plat/onenand.h> |
| 32 | #include <mach/gpmc-smc91x.h> | 32 | #include <plat/gpmc-smc91x.h> |
| 33 | 33 | ||
| 34 | #include "mmc-twl4030.h" | 34 | #include "mmc-twl4030.h" |
| 35 | 35 | ||