From 8d0a8e951237568ff64170a6a08be503aff678c4 Mon Sep 17 00:00:00 2001
From: Nicolas Pitre <nico@org.rmk.(none)>
Date: Thu, 3 Jun 2004 22:04:33 +0100
Subject: [PATCH] [ARM PATCH] 1910/1: rework Mainstone and IDP include files

Patch from Nicolas Pitre

Don't include them from hardware.h
---
 arch/arm/mach-pxa/idp.c             | 2 ++
 arch/arm/mach-pxa/leds-idp.c        | 2 ++
 arch/arm/mach-pxa/leds-mainstone.c  | 2 ++
 arch/arm/mach-pxa/mainstone.c       | 2 ++
 drivers/pcmcia/pxa2xx_mainstone.c   | 2 ++
 include/asm-arm/arch-pxa/hardware.h | 7 -------
 6 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/arch/arm/mach-pxa/idp.c b/arch/arm/mach-pxa/idp.c
index 5e6468a5af351..706858ea24909 100644
--- 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 8f9d2c3c7db6e..adb108c6c2bb3 100644
--- 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 cb6f6ddb06223..8403f67806307 100644
--- 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 cd7da1ddf6850..663c1eef8a0a6 100644
--- 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 af85842ee33c5..fe62a597d87f6 100644
--- 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 1176edc15667e..ffd2fa2eb5020 100644
--- 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 */
-- 
2.53.0