diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-08-15 11:49:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-08-15 11:49:31 -0400 |
| commit | 590a94d93475fa6cca257f161ae268ed3a2395b5 (patch) | |
| tree | d08735ef1dc8260e73f6e95832bfa90d172a7a4a /arch/arm/Makefile | |
| parent | 6973ee7e602b08f624bbf7379b6f68054c71aebb (diff) | |
| parent | c35d3a418149f145ff0d90833db3e298e88de1ad (diff) | |
Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 into devel-stable
Diffstat (limited to 'arch/arm/Makefile')
| -rw-r--r-- | arch/arm/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index e150f232458d..8f117acd98e9 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
| @@ -142,6 +142,7 @@ machine-$(CONFIG_ARCH_MSM) := msm | |||
| 142 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 | 142 | machine-$(CONFIG_ARCH_MV78XX0) := mv78xx0 |
| 143 | machine-$(CONFIG_ARCH_MX1) := mx1 | 143 | machine-$(CONFIG_ARCH_MX1) := mx1 |
| 144 | machine-$(CONFIG_ARCH_MX2) := mx2 | 144 | machine-$(CONFIG_ARCH_MX2) := mx2 |
| 145 | machine-$(CONFIG_ARCH_MX25) := mx25 | ||
| 145 | machine-$(CONFIG_ARCH_MX3) := mx3 | 146 | machine-$(CONFIG_ARCH_MX3) := mx3 |
| 146 | machine-$(CONFIG_ARCH_NETX) := netx | 147 | machine-$(CONFIG_ARCH_NETX) := netx |
| 147 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx | 148 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx |
| @@ -165,6 +166,7 @@ machine-$(CONFIG_ARCH_U300) := u300 | |||
| 165 | machine-$(CONFIG_ARCH_VERSATILE) := versatile | 166 | machine-$(CONFIG_ARCH_VERSATILE) := versatile |
| 166 | machine-$(CONFIG_ARCH_W90X900) := w90x900 | 167 | machine-$(CONFIG_ARCH_W90X900) := w90x900 |
| 167 | machine-$(CONFIG_FOOTBRIDGE) := footbridge | 168 | machine-$(CONFIG_FOOTBRIDGE) := footbridge |
| 169 | machine-$(CONFIG_ARCH_MXC91231) := mxc91231 | ||
| 168 | 170 | ||
| 169 | # Platform directory name. This list is sorted alphanumerically | 171 | # Platform directory name. This list is sorted alphanumerically |
| 170 | # by CONFIG_* macro name. | 172 | # by CONFIG_* macro name. |