[ARM PATCH] 2512/1: S3C2410 - remove bast-cpld.h from include/asm-arm/arch-s3c2410/hardware.h

Patch from Ben Dooks

Remove the include of bast-cpld.h, as it shouldn't be here as
it only defines some extra bast-specific registers, and does
not affect the configuration of the hardware dependenat items.
Ensure that the file is included in the one place it is needed
and not included.
This should discourage anyone else putting include files in
which do not affect the over-all hardware definitions.

Signed-off-by: Ben Dooks
Signed-off-by: Russell King

arch/arm/mach-s3c2410/mach-bast.c

@@ -23,6 +23,7 @@
  *     04-Jan-2005 BJD  New uart init call
  *     10-Jan-2005 BJD  Removed include of s3c2410.h
  *     14-Jan-2005 BJD  Add support for muitlple NAND devices
+ *     03-Mar-2005 BJD  Ensured that bast-cpld.h is included
 */
 
 #include <linux/kernel.h>
@@ -39,6 +40,7 @@
 
 #include <asm/arch/bast-map.h>
 #include <asm/arch/bast-irq.h>
+#include <asm/arch/bast-cpld.h>
 
 #include <asm/hardware.h>
 #include <asm/io.h>

include/asm-arm/arch-s3c2410/hardware.h

@@ -97,11 +97,7 @@ extern unsigned int s3c2410_modify_misccr(unsigned int clr, unsigned int chg);
 #include <asm/sizes.h>
 #include <asm/arch/map.h>
 
-/* machine specific includes, such as the BAST */
-
-#if defined(CONFIG_ARCH_BAST)
-#include <asm/arch/bast-cpld.h>
-#endif
+/* machine specific hardware definitions should go after this */
 
 /* currently here until moved into config (todo) */
 #define CONFIG_NO_MULTIWORD_IO