Merge branch 'imx' into devel

Conflicts: arch/arm/mm/Kconfig
mariux64 · Jul 10, 2008 · f000631 · f000631
2 parents a177ba3 + 1bd55a4
commit f000631
Show file tree

Hide file tree

Showing 92 changed files with 13,540 additions and 610 deletions.
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
@@ -401,7 +401,11 @@ config ARCH_MV78XX0
 
 config ARCH_MXC
 	bool "Freescale MXC/iMX-based"
+	select GENERIC_TIME
+	select GENERIC_CLOCKEVENTS
 	select ARCH_MTD_XIP
+	select GENERIC_GPIO
+	select HAVE_GPIO_LIB
 	help
 	  Support for Freescale MXC/iMX-based family of processors
 

diff --git a/arch/arm/Makefile b/arch/arm/Makefile
@@ -136,6 +136,7 @@ endif
  machine-$(CONFIG_ARCH_KIRKWOOD)   := kirkwood
  machine-$(CONFIG_ARCH_KS8695)     := ks8695
   incdir-$(CONFIG_ARCH_MXC)	   := mxc
+ machine-$(CONFIG_ARCH_MX2)	   := mx2
  machine-$(CONFIG_ARCH_MX3)	   := mx3
  machine-$(CONFIG_ARCH_ORION5X)	   := orion5x
  machine-$(CONFIG_ARCH_MSM7X00A)   := msm