diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2009-12-11 13:57:42 -0500 |
| commit | 5c6baba84e1ac6a79b266b40e17e692aab6604a1 (patch) | |
| tree | 6ba34db1109107023d753dd9fd5c359b3b990a04 /arch/arm/mach-omap1/board-nokia770.c | |
| parent | 893f38d144a4d96d2483cd7c3801d26e1b2c23e9 (diff) | |
| parent | 3ef884b4c04e857c283cc77ca70ad8f638d94b0e (diff) | |
Merge commit 'linus/master' into x86/urgent
Diffstat (limited to 'arch/arm/mach-omap1/board-nokia770.c')
| -rw-r--r-- | arch/arm/mach-omap1/board-nokia770.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap1/board-nokia770.c b/arch/arm/mach-omap1/board-nokia770.c index 5a275bab2dfe..71e1a3fad0ea 100644 --- a/arch/arm/mach-omap1/board-nokia770.c +++ b/arch/arm/mach-omap1/board-nokia770.c | |||
| @@ -14,6 +14,7 @@ | |||
| 14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
| 15 | #include <linux/input.h> | 15 | #include <linux/input.h> |
| 16 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
| 17 | #include <linux/omapfb.h> | ||
| 17 | 18 | ||
| 18 | #include <linux/spi/spi.h> | 19 | #include <linux/spi/spi.h> |
| 19 | #include <linux/spi/ads7846.h> | 20 | #include <linux/spi/ads7846.h> |
| @@ -32,7 +33,6 @@ | |||
| 32 | #include <plat/keypad.h> | 33 | #include <plat/keypad.h> |
| 33 | #include <plat/common.h> | 34 | #include <plat/common.h> |
| 34 | #include <plat/dsp_common.h> | 35 | #include <plat/dsp_common.h> |
| 35 | #include <plat/omapfb.h> | ||
| 36 | #include <plat/hwa742.h> | 36 | #include <plat/hwa742.h> |
| 37 | #include <plat/lcd_mipid.h> | 37 | #include <plat/lcd_mipid.h> |
| 38 | #include <plat/mmc.h> | 38 | #include <plat/mmc.h> |