diff options
| author | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2009-11-22 13:08:43 -0500 |
| commit | a76df42a675c9936e8bf3607226e74c8a5e2d847 (patch) | |
| tree | 96d93706d884dea956393653452fa4d78d8d7f76 /arch/arm/mach-omap1/board-ams-delta.c | |
| parent | 648f4e3e50c4793d9dbf9a09afa193631f76fa26 (diff) | |
| parent | 8171d88089ad63fc442b2bf32af7c18653adc5cb (diff) | |
Merge 7xx-iosplit-plat-merge with omap-fixes
Merge branch '7xx-iosplit-plat-merge' into omap-for-linus
Diffstat (limited to 'arch/arm/mach-omap1/board-ams-delta.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-ams-delta.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/mach-omap1/board-ams-delta.c b/arch/arm/mach-omap1/board-ams-delta.c index 8ad5cc3e83e3..7fc11c34b696 100644 --- a/arch/arm/mach-omap1/board-ams-delta.c +++ b/arch/arm/mach-omap1/board-ams-delta.c | |||
| @@ -25,13 +25,13 @@ | |||
| 25 | #include <asm/mach/arch.h> | 25 | #include <asm/mach/arch.h> |
| 26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
| 27 | 27 | ||
| 28 | #include <mach/board-ams-delta.h> | 28 | #include <plat/board-ams-delta.h> |
| 29 | #include <mach/gpio.h> | 29 | #include <mach/gpio.h> |
| 30 | #include <mach/keypad.h> | 30 | #include <plat/keypad.h> |
| 31 | #include <mach/mux.h> | 31 | #include <plat/mux.h> |
| 32 | #include <mach/usb.h> | 32 | #include <plat/usb.h> |
| 33 | #include <mach/board.h> | 33 | #include <plat/board.h> |
| 34 | #include <mach/common.h> | 34 | #include <plat/common.h> |
| 35 | 35 | ||
| 36 | static u8 ams_delta_latch1_reg; | 36 | static u8 ams_delta_latch1_reg; |
| 37 | static u16 ams_delta_latch2_reg; | 37 | static u16 ams_delta_latch2_reg; |