diff options
author | Tony Lindgren <tony@atomide.com> | 2009-11-11 03:10:34 +0100 |
---|---|---|
committer | Tony Lindgren <tony@atomide.com> | 2009-11-11 03:10:34 +0100 |
commit | 774facda20d2f8f0f61fa312d8028dad18ac5ee4 (patch) | |
tree | a9068b769fa5956beaabc2445ebe1d575585d7d3 /drivers/video/omap/lcd_overo.c | |
parent | Linux 2.6.32-rc6 (diff) | |
parent | omap: headers: Move remaining headers from include/mach to include/plat (diff) | |
download | linux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.tar.xz linux-774facda20d2f8f0f61fa312d8028dad18ac5ee4.zip |
Merge branch '7xx-iosplit-plat' with omap-fixes
Diffstat (limited to 'drivers/video/omap/lcd_overo.c')
-rw-r--r-- | drivers/video/omap/lcd_overo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/lcd_overo.c b/drivers/video/omap/lcd_overo.c index 2bc5c9268e5e..b0f86e514cde 100644 --- a/drivers/video/omap/lcd_overo.c +++ b/drivers/video/omap/lcd_overo.c @@ -24,8 +24,8 @@ #include <linux/i2c/twl4030.h> #include <mach/gpio.h> -#include <mach/mux.h> -#include <mach/omapfb.h> +#include <plat/mux.h> +#include <plat/omapfb.h> #include <asm/mach-types.h> #define LCD_ENABLE 144 |