From 7804585be37d9aa982df2d476a795cbe459dae4a Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Sat, 30 Aug 2008 11:07:04 -0300
Subject: Backport changes on arch

From: Mauro Carvalho Chehab <mchehab@redhat.com>

kernel-sync:

Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
---
 linux/arch/arm/mach-pxa/devices.c          | 16 ++++++++++++++++
 linux/arch/arm/mach-pxa/pcm990-baseboard.c | 17 +++++++++++++++++
 2 files changed, 33 insertions(+)

diff --git a/linux/arch/arm/mach-pxa/devices.c b/linux/arch/arm/mach-pxa/devices.c
index 84489dc51..c77a4f753 100644
--- a/linux/arch/arm/mach-pxa/devices.c
+++ b/linux/arch/arm/mach-pxa/devices.c
@@ -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 --git a/linux/arch/arm/mach-pxa/pcm990-baseboard.c b/linux/arch/arm/mach-pxa/pcm990-baseboard.c
index 30023b00e..973370295 100644
--- a/linux/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/linux/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -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"
-- 
cgit v1.2.3