From 8b084b62a8d4396562f5e85e151a2417e4049ad9 Mon Sep 17 00:00:00 2001
From: Russell King <rmk@flint.arm.linux.org.uk>
Date: Thu, 3 Jun 2004 19:01:25 +0100
Subject: [PATCH] [ARM] Don't include lubbock.h in asm/arch/hardware.h

Since asm/arch/hardware.h is included (indirectly) by most kernel
files, we don't want all these files depending on the individual
machine support files, especially as only five files really require
the header.

Instead, explicitly include lubbock.h into files as necessary.
---
 arch/arm/mach-pxa/leds-lubbock.c    | 1 +
 arch/arm/mach-pxa/lubbock.c         | 1 +
 arch/arm/mach-pxa/pm.c              | 1 +
 drivers/mtd/maps/lubbock-flash.c    | 3 ++-
 drivers/pcmcia/pxa2xx_lubbock.c     | 1 +
 include/asm-arm/arch-pxa/hardware.h | 2 --
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/arch/arm/mach-pxa/leds-lubbock.c b/arch/arm/mach-pxa/leds-lubbock.c
index 6d1de79ab57cd..0e083b34ee514 100644
--- a/arch/arm/mach-pxa/leds-lubbock.c
+++ b/arch/arm/mach-pxa/leds-lubbock.c
@@ -17,6 +17,7 @@
 #include <asm/hardware.h>
 #include <asm/leds.h>
 #include <asm/system.h>
+#include <asm/arch/lubbock.h>
 
 #include "leds.h"
 
diff --git a/arch/arm/mach-pxa/lubbock.c b/arch/arm/mach-pxa/lubbock.c
index da026d4378332..023c5e9f316ff 100644
--- a/arch/arm/mach-pxa/lubbock.c
+++ b/arch/arm/mach-pxa/lubbock.c
@@ -29,6 +29,7 @@
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
 
+#include <asm/arch/lubbock.h>
 #include <asm/arch/udc.h>
 #include <asm/arch/pxafb.h>
 #include <asm/hardware/sa1111.h>
diff --git a/arch/arm/mach-pxa/pm.c b/arch/arm/mach-pxa/pm.c
index de6b7e257d33e..245e25b08f2f8 100644
--- a/arch/arm/mach-pxa/pm.c
+++ b/arch/arm/mach-pxa/pm.c
@@ -19,6 +19,7 @@
 #include <asm/hardware.h>
 #include <asm/memory.h>
 #include <asm/system.h>
+#include <asm/arch/lubbock.h>
 
 
 /*
diff --git a/drivers/mtd/maps/lubbock-flash.c b/drivers/mtd/maps/lubbock-flash.c
index c7e25466c88c2..5f7bdd883e83f 100644
--- a/drivers/mtd/maps/lubbock-flash.c
+++ b/drivers/mtd/maps/lubbock-flash.c
@@ -15,11 +15,12 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <asm/io.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/map.h>
 #include <linux/mtd/partitions.h>
+#include <asm/io.h>
 #include <asm/hardware.h>
+#include <asm/arch/lubbock.h>
 
 
 #define ROM_ADDR	0x00000000
diff --git a/drivers/pcmcia/pxa2xx_lubbock.c b/drivers/pcmcia/pxa2xx_lubbock.c
index c18f2860524d8..e22a57a4a481b 100644
--- a/drivers/pcmcia/pxa2xx_lubbock.c
+++ b/drivers/pcmcia/pxa2xx_lubbock.c
@@ -25,6 +25,7 @@
 #include <asm/hardware.h>
 #include <asm/hardware/sa1111.h>
 #include <asm/mach-types.h>
+#include <asm/arch/lubbock.h>
 
 #include "sa1111_generic.h"
 
diff --git a/include/asm-arm/arch-pxa/hardware.h b/include/asm-arm/arch-pxa/hardware.h
index bd600bd0ee19a..1176edc15667e 100644
--- a/include/asm-arm/arch-pxa/hardware.h
+++ b/include/asm-arm/arch-pxa/hardware.h
@@ -94,8 +94,6 @@ extern unsigned int get_lcdclk_frequency_10khz(void);
 /*
  * Implementation specifics
  */
-
-#include "lubbock.h"
 #include "mainstone.h"
 #include "idp.h"
 
-- 
2.53.0