diff options
| author | Takashi Iwai <tiwai@suse.de> | 2009-12-14 18:01:56 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-12-14 18:01:56 +0100 |
| commit | b89371621e5bedc84498ced2c5c33976bd1b2f64 (patch) | |
| tree | b309919239586e25617a17785b827577b1abb6b5 /drivers/video/omap/lcd_omap3evm.c | |
| parent | sound: add Edirol UA-101 support (diff) | |
| parent | ALSA: sb_mixer: convert pointer tables to mixer control tables (diff) | |
| download | linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.tar.xz linux-b89371621e5bedc84498ced2c5c33976bd1b2f64.zip | |
Merge branch 'next/isa' into topic/misc
Diffstat (limited to 'drivers/video/omap/lcd_omap3evm.c')
| -rw-r--r-- | drivers/video/omap/lcd_omap3evm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/video/omap/lcd_omap3evm.c b/drivers/video/omap/lcd_omap3evm.c index b6a4c2c57a2f..556eb31db24c 100644 --- a/drivers/video/omap/lcd_omap3evm.c +++ b/drivers/video/omap/lcd_omap3evm.c @@ -25,8 +25,8 @@ #include <linux/gpio.h> #include <linux/i2c/twl4030.h> -#include <mach/mux.h> -#include <mach/omapfb.h> +#include <plat/mux.h> +#include <plat/omapfb.h> #include <asm/mach-types.h> #define LCD_PANEL_ENABLE_GPIO 153 |