diff -rupN powervr-omap3-4.00.00.01/GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c powervr-omap3-4.00.00.01-2//GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
--- powervr-omap3-4.00.00.01/GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c	2011-04-12 10:50:20.000000000 +0300
+++ powervr-omap3-4.00.00.01-2//GFX_Linux_KM/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c	2012-02-07 09:07:32.396537716 +0200
@@ -44,7 +44,9 @@
 #if defined (SUPPORT_TI_DSS_FW)
 #include <asm/io.h>
 
-#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))
+#include <video/omapdss.h>
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
 #include <plat/display.h>
 #else 
 #include <asm/arch-omap/display.h>
@@ -56,7 +58,11 @@ extern int omap_dispc_request_irq(unsign
 extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *);
 extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr);
 #else
+#if (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,39))
+#include <video/omapdss.h>
+#else
 #include <plat/display.h>
+#endif
 #include <linux/console.h>
 #include <linux/fb.h>
 static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;
diff -rupN powervr-omap3-4.00.00.01/GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c powervr-omap3-4.00.00.01-2//GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c
--- powervr-omap3-4.00.00.01/GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c	2011-04-12 10:50:20.000000000 +0300
+++ powervr-omap3-4.00.00.01-2//GFX_Linux_KM/services4/srvkm/env/linux/osfunc.c	2012-02-07 09:07:32.404537616 +0200
@@ -1516,7 +1516,7 @@ typedef struct TIMER_CALLBACK_DATA_TAG
 
 static TIMER_CALLBACK_DATA sTimers[OS_MAX_TIMERS];
 
-static spinlock_t sTimerStructLock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(sTimerStructLock);
 
 static IMG_VOID OSTimerCallbackWrapper(IMG_UINT32 ui32Data)
 {