← Back to branch summary

~beagleboard-kernel/+junk/2.6.34-devel

« back to all changes in this revision

Viewing changes to patches/sgx/0001-OMAP3-SGX-TI-3.01.00.02-mach-to-plat.diff

  • Committer: Robert Nelson
  • Date: 2010-05-13 01:54:41 UTC
  • Revision ID: voodoo@lvrm-20100513015441-sruo2r7t5h4w4koo
sgx: little closer, for some reason the includes stop being passed

Show diffs side-by-side

added added

removed removed

Lines of Context:
patches/sgx/0001-OMAP3-SGX-TI-3.01.00.02-mach-to-plat.diff
 
1
diff --git a/drivers/staging/omap3-sgx/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c b/drivers/staging/omap3-sgx/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
 
2
index d1dadfc..a293b1a 100644
 
3
--- a/drivers/staging/omap3-sgx/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
 
4
+++ b/drivers/staging/omap3-sgx/services4/3rdparty/dc_omap3430_linux/omaplfb_linux.c
 
5
@@ -56,7 +56,11 @@ extern int omap_dispc_request_irq(unsigned long, void (*)(void *), void *);
 
6
 extern void omap_dispc_free_irq(unsigned long, void (*)(void *), void *);
 
7
 extern void omap_dispc_set_plane_base(int plane, IMG_UINT32 phys_addr);
 
8
 #else
 
9
-#include <mach/display.h>
 
10
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,32)
 
11
+#include <plat/display.h>
 
12
+#else
 
13
+ #include <mach/display.h>
 
14
+#endif
 
15
 #include <linux/console.h>
 
16
 #include <linux/fb.h>
 
17
 static omap_dispc_isr_t *pOMAPLFBVSyncISRHandle = NULL;