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-omap1/board-h2.c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap1/board-h2.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-h2.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c index aab860307dca..89ba8ec4bbf4 100644 --- a/arch/arm/mach-omap1/board-h2.c +++ b/arch/arm/mach-omap1/board-h2.c | |||
| @@ -37,14 +37,14 @@ | |||
| 37 | #include <asm/mach/flash.h> | 37 | #include <asm/mach/flash.h> |
| 38 | #include <asm/mach/map.h> | 38 | #include <asm/mach/map.h> |
| 39 | 39 | ||
| 40 | #include <mach/mux.h> | 40 | #include <plat/mux.h> |
| 41 | #include <mach/dma.h> | 41 | #include <plat/dma.h> |
| 42 | #include <mach/tc.h> | 42 | #include <plat/tc.h> |
| 43 | #include <mach/nand.h> | 43 | #include <plat/nand.h> |
| 44 | #include <mach/irda.h> | 44 | #include <plat/irda.h> |
| 45 | #include <mach/usb.h> | 45 | #include <plat/usb.h> |
| 46 | #include <mach/keypad.h> | 46 | #include <plat/keypad.h> |
| 47 | #include <mach/common.h> | 47 | #include <plat/common.h> |
| 48 | 48 | ||
| 49 | #include "board-h2.h" | 49 | #include "board-h2.h" |
| 50 | 50 | ||