diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:35:54 -0400 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2011-05-24 02:35:54 -0400 |
| commit | a6b5825aa703714523a745a8e050b9d6105f6704 (patch) | |
| tree | 1d5939799cfece8200f832f423fbb7fb57cc54b9 /arch/arm/mach-omap2/include/mach | |
| parent | 9fb4c7fbbcb1e947567d13b82e429ae47a46e337 (diff) | |
| parent | 0d66cbb53eca4ab3db85d9189d5a85c9fac49b84 (diff) | |
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/mach')
| -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 d20bd9c1a106..775fdc3b000b 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 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * Defines for zoom boards | 2 | * Defines for zoom boards |
| 3 | */ | 3 | */ |
| 4 | #include <plat/display.h> | 4 | #include <video/omapdss.h> |
| 5 | 5 | ||
| 6 | #define ZOOM_NAND_CS 0 | 6 | #define ZOOM_NAND_CS 0 |
| 7 | 7 | ||