The patch number 8854 was added via Mauro Carvalho Chehab <[EMAIL PROTECTED]>
to http://linuxtv.org/hg/v4l-dvb master development tree.
Kernel patches in this development tree may be modified to be backward
compatible with older kernels. Compatibility modifications will be
removed before inclusion into the mainstream Kernel
If anyone has any objections, please let us know by sending a message to:
[EMAIL PROTECTED]
------
From: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
Backport changes on arch
kernel-sync:
Signed-off-by: Mauro Carvalho Chehab <[EMAIL PROTECTED]>
---
linux/arch/arm/mach-pxa/devices.c | 16 ++++++++++++++++
linux/arch/arm/mach-pxa/pcm990-baseboard.c | 17 +++++++++++++++++
2 files changed, 33 insertions(+)
diff -r 7f2b60cdc267 -r 6032ecd6ad7e linux/arch/arm/mach-pxa/devices.c
--- a/linux/arch/arm/mach-pxa/devices.c Sat Aug 30 07:43:57 2008 -0300
+++ b/linux/arch/arm/mach-pxa/devices.c Sat Aug 30 11:07:04 2008 -0300
@@ -4,6 +4,7 @@
#include <linux/platform_device.h>
#include <linux/dma-mapping.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
#include <asm/arch/gpio.h>
#include <asm/arch/udc.h>
#include <asm/arch/pxafb.h>
@@ -17,6 +18,21 @@
#include <asm/arch/camera.h>
#include <asm/arch/audio.h>
#include <asm/arch/pxa3xx_nand.h>
+#else
+#include <mach/gpio.h>
+#include <mach/udc.h>
+#include <mach/pxafb.h>
+#include <mach/mmc.h>
+#include <mach/irda.h>
+#include <mach/i2c.h>
+#include <mach/mfp-pxa27x.h>
+#include <mach/ohci.h>
+#include <mach/pxa27x_keypad.h>
+#include <mach/pxa2xx_spi.h>
+#include <mach/camera.h>
+#include <mach/audio.h>
+#include <mach/pxa3xx_nand.h>
+#endif
#include "devices.h"
#include "generic.h"
diff -r 7f2b60cdc267 -r 6032ecd6ad7e linux/arch/arm/mach-pxa/pcm990-baseboard.c
--- a/linux/arch/arm/mach-pxa/pcm990-baseboard.c Sat Aug 30 07:43:57
2008 -0300
+++ b/linux/arch/arm/mach-pxa/pcm990-baseboard.c Sat Aug 30 11:07:04
2008 -0300
@@ -22,16 +22,24 @@
#include <linux/irq.h>
#include <linux/platform_device.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
#include <linux/ide.h>
+#endif
#include <linux/i2c.h>
#include <linux/pwm_backlight.h>
#include <media/soc_camera.h>
#include <asm/gpio.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
#include <asm/arch/i2c.h>
#include <asm/arch/camera.h>
+#else
+#include <mach/i2c.h>
+#include <mach/camera.h>
+#endif
#include <asm/mach/map.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 27)
#include <asm/arch/pxa-regs.h>
#include <asm/arch/audio.h>
#include <asm/arch/mmc.h>
@@ -39,6 +47,15 @@
#include <asm/arch/pcm990_baseboard.h>
#include <asm/arch/pxafb.h>
#include <asm/arch/mfp-pxa27x.h>
+#else
+#include <mach/pxa-regs.h>
+#include <mach/audio.h>
+#include <mach/mmc.h>
+#include <mach/ohci.h>
+#include <mach/pcm990_baseboard.h>
+#include <mach/pxafb.h>
+#include <mach/mfp-pxa27x.h>
+#endif
#include "devices.h"
#include "generic.h"
---
Patch is available at:
http://linuxtv.org/hg/v4l-dvb/rev/6032ecd6ad7e0a6b2568766d7dd05a36d2d976e4
_______________________________________________
linuxtv-commits mailing list
linuxtv-commits@linuxtv.org
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
