269d459ba3e1f0337fdb011919ee803be14bbeb3
[glsdk/meta-ti-glsdk.git] / recipes-bsp / powervr-drivers / omap3-sgx-modules-x11 / kernel-30.patch
1 From: Steve Sakoman
2 Subject: omap3-sgx-modules: Fix build for Linux 3.0
4 This patch implements the header change from plat/display.h to video/omapdss.h
6 Signed-off-by: Steve Sakoman <steve at sakoman.com>
8 --- GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c-orig      2011-08-01 07:21:45.000000000 -0700
9 +++ GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c   2011-08-01 07:29:32.000000000 -0700
10 @@ -47,12 +47,12 @@
11  #if defined (SUPPORT_TI_DSS_FW)
12  #include <asm/io.h>
13  
14 -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
15 -#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
16 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39)))
17 +#include <video/omapdss.h>
18 +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,31))
19  #include <plat/display.h>
20 -#else 
21 +#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
22  #include <mach/display.h>
23 -#endif 
24  #else 
25  #include <asm/arch-omap/display.h>
26  #endif 
27 @@ -64,7 +64,11 @@ extern int omap_dispc_request_irq(unsign
28  extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *);
29  extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr);
30  #else
31 +#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))
32 +#include <video/omapdss.h>
33 +#else
34  #include <plat/display.h>
35 +#endif
36  #include <linux/console.h>
37  #include <linux/fb.h>
38  static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;