diff options
| author | Alex Gonzalez <alex.gonzalez@digi.com> | 2012-02-21 12:01:22 +0100 |
|---|---|---|
| committer | Alex Gonzalez <alex.gonzalez@digi.com> | 2012-02-21 12:14:09 +0100 |
| commit | 1436564512fc3960b3969700d1e5d98d65309021 (patch) | |
| tree | 512cd5b3ed4c451a68f87299874ae00f909d9a22 | |
| parent | c6bc03f21be9ddb84e9a13b6445c1f2ae80f2777 (diff) | |
ccxmx53: Only include iomux-mx53.h for MX53 based platforms.
Otherwise some symbols may clash in other MX platforms builds.
Signed-off-by: Alex Gonzalez <alex.gonzalez@digi.com>
| -rwxr-xr-x | arch/arm/mach-mx5/devices_ccxmx5x.c | 2 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/system.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/mach-mx5/devices_ccxmx5x.c b/arch/arm/mach-mx5/devices_ccxmx5x.c index d600daacc211..519f84735d18 100755 --- a/arch/arm/mach-mx5/devices_ccxmx5x.c +++ b/arch/arm/mach-mx5/devices_ccxmx5x.c @@ -46,7 +46,9 @@ #include <mach/gpio.h> #include <mach/mmc.h> #include <mach/mxc_dvfs.h> +#if defined(CONFIG_MODULE_CCXMX53) #include <mach/iomux-mx53.h> +#endif #include "devices_ccxmx5x.h" diff --git a/arch/arm/plat-mxc/system.c b/arch/arm/plat-mxc/system.c index 0ebb3fb8b1b8..099818b35abe 100644 --- a/arch/arm/plat-mxc/system.c +++ b/arch/arm/plat-mxc/system.c @@ -27,7 +27,9 @@ #include <linux/delay.h> #include <asm/mach-types.h> +#if defined(CONFIG_MODULE_CCXMX53) #include <mach/iomux-mx53.h> +#endif #include <mach/hardware.h> #include <mach/common.h> #include <asm/proc-fns.h> |