diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 06:50:52 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 06:50:52 -0400 |
commit | 701038144945ef98c5817f43079952fa38c35999 (patch) | |
tree | 88782f6ac8e4df1f7f8f738659adedd7108e8cae /arch/arm/Makefile | |
parent | 4abf27add86e5b7c37dca1fb4dd9a740b4332a84 (diff) | |
parent | c2b455474e4c6bc8bab6506e2a08dbd5ad50d74d (diff) |
Merge branch 'nomadik' into devel-stable
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 3de196e2a7a7..b70f62c8fc0a 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile | |||
@@ -145,6 +145,7 @@ machine-$(CONFIG_ARCH_MX2) := mx2 | |||
145 | machine-$(CONFIG_ARCH_MX25) := mx25 | 145 | machine-$(CONFIG_ARCH_MX25) := mx25 |
146 | machine-$(CONFIG_ARCH_MX3) := mx3 | 146 | machine-$(CONFIG_ARCH_MX3) := mx3 |
147 | machine-$(CONFIG_ARCH_NETX) := netx | 147 | machine-$(CONFIG_ARCH_NETX) := netx |
148 | machine-$(CONFIG_ARCH_NOMADIK) := nomadik | ||
148 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx | 149 | machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx |
149 | machine-$(CONFIG_ARCH_OMAP1) := omap1 | 150 | machine-$(CONFIG_ARCH_OMAP1) := omap1 |
150 | machine-$(CONFIG_ARCH_OMAP2) := omap2 | 151 | machine-$(CONFIG_ARCH_OMAP2) := omap2 |