diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-12-09 02:24:25 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-09 02:24:57 -0500 |
| commit | 4c68db38c85188824b21698842b42a62b4f78657 (patch) | |
| tree | 3ee1c3b22af6713adf669a3bb452ce82bc7fe495 /arch/arm/mach-omap1/board-h3.c | |
| parent | 5c0e9f28da84c68ce0ae68b7a75faaf862e156e2 (diff) | |
| parent | 2b876f95d03e226394b5d360c86127cbefaf614b (diff) | |
Merge branch 'linus' into x86/urgent
Merge reason: We want to queue up a dependent patch.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mach-omap1/board-h3.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-h3.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c index 89586b80b8d5..f5cc0a730524 100644 --- a/arch/arm/mach-omap1/board-h3.c +++ b/arch/arm/mach-omap1/board-h3.c | |||
| @@ -40,13 +40,13 @@ | |||
| 40 | #include <asm/mach/map.h> | 40 | #include <asm/mach/map.h> |
| 41 | 41 | ||
| 42 | #include <mach/irqs.h> | 42 | #include <mach/irqs.h> |
| 43 | #include <mach/mux.h> | 43 | #include <plat/mux.h> |
| 44 | #include <mach/tc.h> | 44 | #include <plat/tc.h> |
| 45 | #include <mach/nand.h> | 45 | #include <plat/nand.h> |
| 46 | #include <mach/usb.h> | 46 | #include <plat/usb.h> |
| 47 | #include <mach/keypad.h> | 47 | #include <plat/keypad.h> |
| 48 | #include <mach/dma.h> | 48 | #include <plat/dma.h> |
| 49 | #include <mach/common.h> | 49 | #include <plat/common.h> |
| 50 | 50 | ||
| 51 | #include "board-h3.h" | 51 | #include "board-h3.h" |
| 52 | 52 | ||