diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2009-12-09 01:14:38 -0500 |
| commit | bcd6acd51f3d4d1ada201e9bc5c40a31d6d80c71 (patch) | |
| tree | 2f6dffd2d3e4dd67355a224de7e7a960335a92fd /arch/arm/mach-omap1/board-h3.c | |
| parent | 11c34c7deaeeebcee342cbc35e1bb2a6711b2431 (diff) | |
| parent | 3ff6a468b45b5dfeb0e903e56f4eb27d34b2437c (diff) | |
Merge commit 'origin/master' into next
Conflicts:
include/linux/kvm.h
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 89586b80b8d..f5cc0a73052 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 | ||