[ARM PATCH] 1910/1: rework Mainstone and IDP include files

Patch from Nicolas Pitre

Don't include them from hardware.h

diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index 5e6468a5af351aadfa4874599002b5f5a505a4be..706858ea249092dacc46e12ca4d1ac145f11b11b 100644 (file)
--- a/arch/arm/mach-pxa/idp.c
+++ b/arch/arm/mach-pxa/idp.c
@@ -27,6 +27,8 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 
+#include <asm/arch/idp.h>
+
 #include "generic.h"
 
 #ifndef PXA_IDP_REV02

diff --git a/arch/arm/mach-pxa/leds-idp.c b/arch/arm/mach-pxa/leds-idp.c
index 8f9d2c3c7db6ed7a86b8f05d8cd92aac33c987ca..adb108c6c2bb3cf53aa62e6e8927540bb03bdbaf 100644 (file)
--- a/arch/arm/mach-pxa/leds-idp.c
+++ b/arch/arm/mach-pxa/leds-idp.c
@@ -19,6 +19,8 @@
 #include <asm/leds.h>
 #include <asm/system.h>
 
+#include <asm/arch/idp.h>
+
 #include "leds.h"
 
 #define LED_STATE_ENABLED      1

diff --git a/arch/arm/mach-pxa/leds-mainstone.c b/arch/arm/mach-pxa/leds-mainstone.c
index cb6f6ddb062235177a558ba38f084de543ecc5ee..8403f67806307c6c40bb49b7c34421a46ac47a4f 100644 (file)
--- a/arch/arm/mach-pxa/leds-mainstone.c
+++ b/arch/arm/mach-pxa/leds-mainstone.c
@@ -17,6 +17,8 @@
 #include <asm/leds.h>
 #include <asm/system.h>
 
+#include <asm/arch/mainstone.h>
+
 #include "leds.h"
 
 

diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c
index cd7da1ddf685058b755fb8958629ab53e06eda75..663c1eef8a0a6218cbf3652ab95e6b23fa6277eb 100644 (file)
--- a/arch/arm/mach-pxa/mainstone.c
+++ b/arch/arm/mach-pxa/mainstone.c
@@ -30,6 +30,8 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <asm/arch/mainstone.h>
+
 #include "generic.h"
 
 

diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index af85842ee33c542b3c5522027ca11268c81223f2..fe62a597d87f690ff70e20c3eb1abbd4f9296cc1 100644 (file)
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -24,6 +24,8 @@
 #include <asm/hardware.h>
 #include <asm/irq.h>
 
+#include <asm/arch/mainstone.h>
+
 #include "soc_common.h"
 
 

diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index 1176edc15667e4caaac65a97c106d289ef55c7ca..ffd2fa2eb5020696767124f34cee407e86d9fdff 100644 (file)
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -90,11 +90,4 @@ extern unsigned int get_lcdclk_frequency_10khz(void);
 
 #endif
 
-
-/*
- * Implementation specifics
- */
-#include "mainstone.h"
-#include "idp.h"
-
 #endif  /* _ASM_ARCH_HARDWARE_H */