diff options
author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 15:35:54 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 15:35:54 +0900 |
commit | a6b5825aa703714523a745a8e050b9d6105f6704 (patch) | |
tree | 1d5939799cfece8200f832f423fbb7fb57cc54b9 /arch/arm/mach-omap2/include | |
parent | 9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (diff) | |
parent | 0d66cbb53eca4ab3db85d9189d5a85c9fac49b84 (diff) | |
download | kernel_samsung_smdk4412-a6b5825aa703714523a745a8e050b9d6105f6704.zip kernel_samsung_smdk4412-a6b5825aa703714523a745a8e050b9d6105f6704.tar.gz kernel_samsung_smdk4412-a6b5825aa703714523a745a8e050b9d6105f6704.tar.bz2 |
Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux
Conflicts:
drivers/video/omap2/dss/dsi.c
drivers/video/omap2/dss/dss_features.c
drivers/video/omap2/dss/dss_features.h
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/arm/mach-omap2/include')
-rw-r--r-- | arch/arm/mach-omap2/include/mach/board-zoom.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/include/mach/board-zoom.h b/arch/arm/mach-omap2/include/mach/board-zoom.h index d20bd9c..775fdc3 100644 --- a/arch/arm/mach-omap2/include/mach/board-zoom.h +++ b/arch/arm/mach-omap2/include/mach/board-zoom.h @@ -1,7 +1,7 @@ /* * Defines for zoom boards */ -#include <plat/display.h> +#include <video/omapdss.h> #define ZOOM_NAND_CS 0 |