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 /drivers/video/omap/lcd_apollon.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 'drivers/video/omap/lcd_apollon.c')
| -rw-r--r-- | drivers/video/omap/lcd_apollon.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c index 626ae3a532ff..4c5cefc5153b 100644 --- a/drivers/video/omap/lcd_apollon.c +++ b/drivers/video/omap/lcd_apollon.c | |||
| @@ -25,8 +25,8 @@ | |||
| 25 | #include <linux/platform_device.h> | 25 | #include <linux/platform_device.h> |
| 26 | 26 | ||
| 27 | #include <mach/gpio.h> | 27 | #include <mach/gpio.h> |
| 28 | #include <mach/mux.h> | 28 | #include <plat/mux.h> |
| 29 | #include <mach/omapfb.h> | 29 | #include <plat/omapfb.h> |
| 30 | 30 | ||
| 31 | /* #define USE_35INCH_LCD 1 */ | 31 | /* #define USE_35INCH_LCD 1 */ |
| 32 | 32 | ||