From 7d148c4fc62735c57d6bf2d1980f2ad28e9dc3b7 Mon Sep 17 00:00:00 2001
From: Mauro Carvalho Chehab <mchehab@redhat.com>
Date: Thu, 9 Apr 2009 06:57:51 -0300
Subject: backport commit 51c62982a33d9086fd8876293411d28a5f97247a

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

kernel-sync:
Author: Eric Miao <eric.miao@marvell.com>

    [ARM] pxa: introduce pxa{25x,27x,300,320,930}.h for board usage

    Considering the header mess ATM, it is not always possible to
include
    the correct header files within board code. Let's keep this simple:

      <mach/pxa25x.h>  - for pxa25x based platforms
      <mach/pxa27x.h>  - for pxa27x based platforms
      <mach/pxa300.h>  - for pxa300 based platforms
      <mach/pxa320.h>  - for pxa320 based platforms
      <mach/pxa930.h>  - for pxa930 based platforms

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

(limited to 'linux/arch/arm/mach-pxa')

diff --git a/linux/arch/arm/mach-pxa/devices.c b/linux/arch/arm/mach-pxa/devices.c
index 5b7747052..5ec10735b 100644
--- a/linux/arch/arm/mach-pxa/devices.c
+++ b/linux/arch/arm/mach-pxa/devices.c
@@ -32,7 +32,9 @@
 #include <mach/audio.h>
 #include <mach/pxa3xx_nand.h>
 #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
 #include <mach/pxa-regs.h>
+#endif
 #include <mach/udc.h>
 #include <mach/pxafb.h>
 #include <mach/mmc.h>
diff --git a/linux/arch/arm/mach-pxa/pcm990-baseboard.c b/linux/arch/arm/mach-pxa/pcm990-baseboard.c
index d1df34985..7a95c80ab 100644
--- a/linux/arch/arm/mach-pxa/pcm990-baseboard.c
+++ b/linux/arch/arm/mach-pxa/pcm990-baseboard.c
@@ -48,14 +48,20 @@
 #include <asm/arch/pxafb.h>
 #include <asm/arch/mfp-pxa27x.h>
 #else
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
 #include <mach/pxa-regs.h>
+#else
+#include <mach/pxa27x.h>
+#endif
 #include <mach/audio.h>
 #include <mach/mmc.h>
 #include <mach/ohci.h>
 #include <mach/pcm990_baseboard.h>
 #include <mach/pxafb.h>
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 30)
 #include <mach/mfp-pxa27x.h>
 #endif
+#endif
 
 #include "devices.h"
 #include "generic.h"
-- 
cgit v1.2.3