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-nokia770.c | |
| parent | b419148e567728f6af0c3b01965c1cc141e3e13a (diff) | |
| parent | ce491cf85466c3377228c5a852ea627ec5136956 (diff) | |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'arch/arm/mach-omap1/board-nokia770.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index ed2a48a9ce74..5a275bab2dfe 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
| @@ -26,17 +26,17 @@ | |||
| 26 | #include <asm/mach/map.h> | 26 | #include <asm/mach/map.h> |
| 27 | 27 | ||
| 28 | #include <mach/gpio.h> | 28 | #include <mach/gpio.h> |
| 29 | #include <mach/mux.h> | 29 | #include <plat/mux.h> |
| 30 | #include <mach/usb.h> | 30 | #include <plat/usb.h> |
| 31 | #include <mach/board.h> | 31 | #include <plat/board.h> |
| 32 | #include <mach/keypad.h> | 32 | #include <plat/keypad.h> |
| 33 | #include <mach/common.h> | 33 | #include <plat/common.h> |
| 34 | #include <mach/dsp_common.h> | 34 | #include <plat/dsp_common.h> |
| 35 | #include <mach/omapfb.h> | 35 | #include <plat/omapfb.h> |
| 36 | #include <mach/hwa742.h> | 36 | #include <plat/hwa742.h> |
| 37 | #include <mach/lcd_mipid.h> | 37 | #include <plat/lcd_mipid.h> |
| 38 | #include <mach/mmc.h> | 38 | #include <plat/mmc.h> |
| 39 | #include <mach/clock.h> | 39 | #include <plat/clock.h> |
| 40 | 40 | ||
| 41 | #define ADS7846_PENDOWN_GPIO 15 | 41 | #define ADS7846_PENDOWN_GPIO 15 |
| 42 | 42 | ||