diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 04:15:11 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 04:15:11 -0500 |
| commit | 1fef891761ddcbd7e57ec3961a0fb748003222ac (patch) | |
| tree | d192f1677521e17f1a943f8df570dd6449aa0da8 /arch/arm/Makefile | |
| parent | d3d4b60b12369eded0ea0c5dffee0888ec4d80cd (diff) | |
| parent | 1d3f33d541312acd34bd2fa780396d111a0f73b1 (diff) | |
Merge branch 'sgu/mxs-core-v8' of git://git.pengutronix.de/git/ukl/linux-2.6 into imx-for-2.6.38-new
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 057beb8ee203..c22c1adfedd6 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -158,6 +158,7 @@ machine-$(CONFIG_ARCH_MX25) := imx | |||
| 158 | machine-$(CONFIG_ARCH_MX3) := mx3 | 158 | machine-$(CONFIG_ARCH_MX3) := mx3 |
| 159 | machine-$(CONFIG_ARCH_MX5) := mx5 | 159 | machine-$(CONFIG_ARCH_MX5) := mx5 |
| 160 | machine-$(CONFIG_ARCH_MXC91231) := mxc91231 | 160 | machine-$(CONFIG_ARCH_MXC91231) := mxc91231 |
| 161 | machine-$(CONFIG_ARCH_MXS) := mxs | ||
| 161 | machine-$(CONFIG_ARCH_NETX) := netx | 162 | machine-$(CONFIG_ARCH_NETX) := netx |
| 162 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik | 163 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik |
| 163 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx | 164 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx |