diff options
| author | Ben Dooks <ben-linux@org.rmk.(none)> | 2005-03-03 22:57:33 +0000 |
|---|---|---|
| committer | Russell King <rmk@flint.arm.linux.org.uk> | 2005-03-03 22:57:33 +0000 |
| commit | 1234c028b77dc57bd725017c08fb9ca4fe66efd6 (patch) | |
| tree | 6fe023eece5abfe98c771e98431c55c87df0c15e | |
| parent | 141146803bcc48276807a6bb9294392b4404a1ab (diff) | |
[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
| -rw-r--r-- | arch/arm/mach-s3c2410/mach-bast.c | 2 | ||||
| -rw-r--r-- | include/asm-arm/arch-s3c2410/hardware.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c index 96292e632343..792481c4dc89 100644 --- a/arch/arm/mach-s3c2410/mach-bast.c +++ b/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> diff --git a/include/asm-arm/arch-s3c2410/hardware.h b/include/asm-arm/arch-s3c2410/hardware.h index 7b489fde8fdf..48a39918a760 100644 --- a/include/asm-arm/arch-s3c2410/hardware.h +++ b/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 |