build fixes

diff --git a/Kbuild b/Kbuild
index a34841f..ac8f40e 100644 (file)
--- a/Kbuild
+++ b/Kbuild
@@ -63,3 +63,7 @@ obj-y := services4/3rdparty/dc_omap3430_linux/
 endif
 obj-y += services4/3rdparty/bufferclass_ti/
 
+ifeq ($(VERSION), 3)
+export EXTRA_CFLAGS += -DAUTOCONF_INCLUDED
+endif
+

diff --git a/services4/3rdparty/dc_omap3430_linux/Kbuild b/services4/3rdparty/dc_omap3430_linux/Kbuild
index e867f83..583151a 100644 (file)
--- a/services4/3rdparty/dc_omap3430_linux/Kbuild
+++ b/services4/3rdparty/dc_omap3430_linux/Kbuild
@@ -13,5 +13,9 @@ EXTRA_CFLAGS =        -DLINUX \
                -I$(PVR_BUILD_DIR)/services4/system/include \
                $(SYS_CFLAGS.1) \
 
+ifeq ($(VERSION), 3)
+export EXTRA_CFLAGS += -DAUTOCONF_INCLUDED
+endif
+
 obj-m := omaplfb.o
 omaplfb-y := omaplfb_displayclass.o omaplfb_linux.o

diff --git a/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c b/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c
index 8b0f2ff..249f983 100644 (file)
--- a/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c
+++ b/services4/3rdparty/dc_omap3430_linux/omaplfb_displayclass.c
@@ -38,6 +38,11 @@
 #include "kerneldisplay.h"
 #include "omaplfb.h"
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)
+#define acquire_console_sem console_lock
+#define release_console_sem console_unlock
+#endif
+
 static void *gpvAnchor;
 
 static int fb_idx = 0;

diff --git a/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c b/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
index fa52836..7f40633 100644 (file)
--- a/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
+++ b/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
@@ -61,7 +61,13 @@ extern int omap_dispc_request_irq(unsigned long, void (*)(void *), void *);
 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(3,0,0))
+#include <video/omapdss.h>
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,32))
 #include <plat/display.h>
+#elif (LINUX_VERSION_CODE > KERNEL_VERSION(2,6,26))
+#include <mach/display.h>
+#endif
 #include <linux/console.h>
 #include <linux/fb.h>
 static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;

diff --git a/services4/srvkm/env/linux/pvr_debug.c b/services4/srvkm/env/linux/pvr_debug.c
index 091f659..a76de7c 100644 (file)
--- a/services4/srvkm/env/linux/pvr_debug.c
+++ b/services4/srvkm/env/linux/pvr_debug.c
@@ -72,7 +72,7 @@ static IMG_CHAR gszBufferIRQ[PVR_MAX_MSG_LEN + 1];
 static PVRSRV_LINUX_MUTEX gsDebugMutexNonIRQ;
 
  
-static spinlock_t gsDebugLockIRQ = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(gsDebugLockIRQ);
 
 #if !defined (USE_SPIN_LOCK)  
 #define        USE_SPIN_LOCK (in_interrupt() || !preemptible())