diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-05-09 18:38:51 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-07-07 09:59:58 +0200 |
| commit | db279c1b8dc8b7da9d8de94a0ce103c0b9b8e1ae (patch) | |
| tree | fdd1c27580f3b68076b9be095d9e9609c44cb99d /arch/arm/plat-mxc/include/mach | |
| parent | 5a145baa1a499845103cd566ee5fe509e042aa80 (diff) | |
| download | blackbird-op-linux-db279c1b8dc8b7da9d8de94a0ce103c0b9b8e1ae.tar.gz blackbird-op-linux-db279c1b8dc8b7da9d8de94a0ce103c0b9b8e1ae.zip | |
ARM i.MX: remove SoC defines around header includes
All soc specific header have proper namespace now and thus can
be included at once.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/plat-mxc/include/mach')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/hardware.h | 28 |
1 files changed, 5 insertions, 23 deletions
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h index 67d3e2bed065..a8bfd565dcad 100644 --- a/arch/arm/plat-mxc/include/mach/hardware.h +++ b/arch/arm/plat-mxc/include/mach/hardware.h @@ -97,35 +97,17 @@ #include <mach/mxc.h> -#ifdef CONFIG_ARCH_MX5 #include <mach/mx50.h> #include <mach/mx51.h> #include <mach/mx53.h> -#endif - -#ifdef CONFIG_ARCH_MX3 #include <mach/mx3x.h> #include <mach/mx31.h> #include <mach/mx35.h> -#endif - -#ifdef CONFIG_ARCH_MX2 -# include <mach/mx2x.h> -# ifdef CONFIG_MACH_MX21 -# include <mach/mx21.h> -# endif -# ifdef CONFIG_MACH_MX27 -# include <mach/mx27.h> -# endif -#endif - -#ifdef CONFIG_ARCH_MX1 -# include <mach/mx1.h> -#endif - -#ifdef CONFIG_ARCH_MX25 -# include <mach/mx25.h> -#endif +#include <mach/mx2x.h> +#include <mach/mx21.h> +#include <mach/mx27.h> +#include <mach/mx1.h> +#include <mach/mx25.h> #define imx_map_entry(soc, name, _type) { \ .virtual = soc ## _IO_P2V(soc ## _ ## name ## _BASE_ADDR), \ |
