projects / platform / kernel / kernel-mfld-blackbay.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4abf27a c2b4554)
Merge branch 'nomadik' into devel-stable
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Sat, 12 Sep 2009 10:50:52 +0000 (11:50 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Sat, 12 Sep 2009 10:50:52 +0000 (11:50 +0100)
1  2 
arch/arm/Kconfig patch | diff1 | diff2 | blob | history
arch/arm/Makefile patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm/Makefile
index 3de196e,97cca07..b70f62c
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -142,9 -135,9 +142,10 @@@ machine-$(CONFIG_ARCH_MSM)                := ms
  machine-$(CONFIG_ARCH_MV78XX0)                := mv78xx0
  machine-$(CONFIG_ARCH_MX1)            := mx1
  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
Domain: System / Uncategorized;