lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'for-paul' of git://gitorious.org/linux-omap-dss2/linux

Browse Source 
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>
This commit is contained in:
Paul Mundt
2011-05-24 15:35:54 +09:00
parent 9fb4c7fbbc 0d66cbb53e
commit a6b5825aa7
55 changed files with 5099 additions and 2112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/mach-omap2/include/mach/board-zoom.h
View File

@@ -1,7 +1,7 @@
/*
* Defines for zoom boards
*/
#include <plat/display.h>
#include <video/omapdss.h>
#define ZOOM_NAND_CS 0