diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-09-12 12:50:52 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-09-12 12:50:52 +0200 |
| commit | 701038144945ef98c5817f43079952fa38c35999 (patch) | |
| tree | 88782f6ac8e4df1f7f8f738659adedd7108e8cae /arch/arm/Makefile | |
| parent | Merge branch 'for-rmk' of git://git.marvell.com/orion into devel-stable (diff) | |
| parent | [ARM] 5588/1: nomadik: add defconfig for nhk8815 (diff) | |
| download | linux-701038144945ef98c5817f43079952fa38c35999.tar.xz linux-701038144945ef98c5817f43079952fa38c35999.zip | |
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 machine-$(CONFIG_ARCH_MX25) := mx25 machine-$(CONFIG_ARCH_MX3) := mx3 machine-$(CONFIG_ARCH_NETX) := netx +machine-$(CONFIG_ARCH_NOMADIK) := nomadik machine-$(CONFIG_ARCH_NS9XXX) := ns9xxx machine-$(CONFIG_ARCH_OMAP1) := omap1 machine-$(CONFIG_ARCH_OMAP2) := omap2 |