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