diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-10 05:11:37 -0500 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-02-10 05:11:37 -0500 |
| commit | fed9b63ca5aa999e618140cc1cc6bd73f212ec9b (patch) | |
| tree | 1dc078e208d879a65f8cc2515e0817a109272d59 /arch/arm/Makefile | |
| parent | d2831d1f543489ef97a20e6e65f625e195b521bf (diff) | |
| parent | 3d48e1d0e8701d004ce7e1dd66088f42e429d079 (diff) | |
Merge branch 'mx51-baseport-sascha' of git://kernel.ubuntu.com/amitk/mx51-upstream into mxc-master
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 e9da08483b3c..056daf8b68a5 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -146,6 +146,7 @@ machine-$(CONFIG_ARCH_MX1) := mx1 | |||
| 146 | machine-$(CONFIG_ARCH_MX2) := mx2 | 146 | machine-$(CONFIG_ARCH_MX2) := mx2 |
| 147 | machine-$(CONFIG_ARCH_MX25) := mx25 | 147 | machine-$(CONFIG_ARCH_MX25) := mx25 |
| 148 | machine-$(CONFIG_ARCH_MX3) := mx3 | 148 | machine-$(CONFIG_ARCH_MX3) := mx3 |
| 149 | machine-$(CONFIG_ARCH_MX5) := mx5 | ||
| 149 | machine-$(CONFIG_ARCH_NETX) := netx | 150 | machine-$(CONFIG_ARCH_NETX) := netx |
| 150 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik | 151 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik |
| 151 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx | 152 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx |