diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-11-09 17:54:17 -0500 |
| commit | f56f52e02a9c3da4bc2cc6eb9ddcf5602ea44b37 (patch) | |
| tree | a9ce4f46ea3b2e516698b2c3817e40414a8bbf51 /arch/arm/mach-omap2/board-zoom-display.c | |
| parent | 84fbd2b8c8da49b4e53fcb484a1564a9b5da61b3 (diff) | |
| parent | 6ba54ab4a49bbad736b0254aa6bdf0cb83013815 (diff) | |
Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt
Conflicts:
arch/arm/plat-omap/dmtimer.c
Resolved as suggested by Jon Hunter.
Diffstat (limited to 'arch/arm/mach-omap2/board-zoom-display.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-zoom-display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-zoom-display.c b/arch/arm/mach-omap2/board-zoom-display.c index b940ab2259fb..1c7c834a5b5f 100644 --- a/arch/arm/mach-omap2/board-zoom-display.c +++ b/arch/arm/mach-omap2/board-zoom-display.c | |||
| @@ -16,8 +16,9 @@ | |||
| 16 | #include <linux/spi/spi.h> | 16 | #include <linux/spi/spi.h> |
| 17 | #include <linux/platform_data/spi-omap2-mcspi.h> | 17 | #include <linux/platform_data/spi-omap2-mcspi.h> |
| 18 | #include <video/omapdss.h> | 18 | #include <video/omapdss.h> |
| 19 | #include <mach/board-zoom.h> | 19 | #include "board-zoom.h" |
| 20 | 20 | ||
| 21 | #include "soc.h" | ||
| 21 | #include "common.h" | 22 | #include "common.h" |
| 22 | 23 | ||
| 23 | #define LCD_PANEL_RESET_GPIO_PROD 96 | 24 | #define LCD_PANEL_RESET_GPIO_PROD 96 |