diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 00:27:11 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-07-21 00:27:11 +0200 |
| commit | a19e67bf730e0c6ed12a2a98277525c52c931565 (patch) | |
| tree | dc3146d0a089089743f958e9b0d4fee4b49fedb3 | |
| parent | ce3ef9066f62921b0c05630422ad6f06575d18e9 (diff) | |
| download | kernel_goldelico_gta04-a19e67bf730e0c6ed12a2a98277525c52c931565.zip kernel_goldelico_gta04-a19e67bf730e0c6ed12a2a98277525c52c931565.tar.gz kernel_goldelico_gta04-a19e67bf730e0c6ed12a2a98277525c52c931565.tar.bz2 | |
MERGE
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3gta04.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3gta04.c b/arch/arm/mach-omap2/board-omap3gta04.c index 013972d..2975f21 100644 --- a/arch/arm/mach-omap2/board-omap3gta04.c +++ b/arch/arm/mach-omap2/board-omap3gta04.c @@ -58,7 +58,7 @@ #include "common.h" #include <video/omapdss.h> -#include <video/omap-panel-generic-dpi.h> +#include <video/omap-panel-data.h> #include <linux/platform_data/mtd-nand-omap2.h> #include <linux/platform_data/gpio-omap.h> #include <linux/platform_data/spi-omap2-mcspi.h> |