diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 01:40:31 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2009-12-10 01:40:31 -0500 |
| commit | b5c00a3a412857d6f07970984068c450429e051c (patch) | |
| tree | 1fde50630cbc24e11a45169f717f281db8eb6dcc /arch/arm/mach-omap1/board-nokia770.c | |
| parent | ca6f2d7fafd2d48b2f6943f5c6787beaec2014d0 (diff) | |
| parent | 3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
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 | ||