Merge branch 'rmk-devel-mxc-pu-v2' of git://pasiphae.extern.pengutron…

…ix.de/git/imx/linux-2.6 into devel
git-mirror · Dec 17, 2008 · c95a443 · c95a443
2 parents c613bbb + 47fee6f
commit c95a443
Show file tree

Hide file tree

Showing 46 changed files with 3,887 additions and 363 deletions.
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
@@ -139,6 +139,7 @@ endif
     plat-$(CONFIG_ARCH_MXC)	   := mxc
  machine-$(CONFIG_ARCH_MX2)	   := mx2
  machine-$(CONFIG_ARCH_MX3)	   := mx3
+ machine-$(CONFIG_ARCH_MX1)	   := mx1
  machine-$(CONFIG_ARCH_ORION5X)	   := orion5x
     plat-$(CONFIG_PLAT_ORION)	   := orion
  machine-$(CONFIG_ARCH_MSM)	   := msm