Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm

* 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm: (422 commits)
  [ARM] 5435/1: fix compile warning in sanity_check_meminfo()
  [ARM] 5434/1: ARM: OMAP: Fix mailbox compile for 24xx
  [ARM] pxa: fix the bad assumption that PCMCIA sockets always start with 0
  [ARM] pxa: fix Colibri PXA300 and PXA320 LCD backlight pins
  imxfb: Fix TFT mode
  i.MX21/27: remove ifdef CONFIG_FB_IMX
  imxfb: add clock support
  mxc: add arch_reset() function
  clkdev: add possibility to get a clock based on the device name
  i.MX1: remove fb support from mach-imx
  [ARM] pxa: build arch/arm/plat-pxa/mfp.c only when PXA3xx or ARCH_MMP defined
  Gemini: Add support for Teltonika RUT100
  Gemini: gpiolib based GPIO support v2
  MAINTAINERS: add myself as Gemini architecture maintainer
  ARM: Add Gemini architecture v3
  [ARM] OMAP: Fix compile for omap2_init_common_hw()
  MAINTAINERS: Add myself as Faraday ARM core variant maintainer
  ARM: Add support for FA526 v2
  [ARM] acorn,ebsa110,footbridge,integrator,sa1100: Convert asm/io.h to linux/io.h
  [ARM] collie: fix two minor formatting nits
  ...

1 files changed, 47 insertions, 0 deletions

diff --git a/arch/arm/mach-mmp/Kconfig b/arch/arm/mach-mmp/Kconfig
new file mode 100644
index 000000000000..c6a564fc4a7c
--- /dev/null
+++ b/arch/arm/mach-mmp/Kconfig
@@ -0,0 +1,47 @@
+if ARCH_MMP
+
+menu "Marvell PXA168/910 Implmentations"
+
+config MACH_ASPENITE
+        bool "Marvell's PXA168 Aspenite Development Board"
+        select CPU_PXA168
+        help
+          Say 'Y' here if you want to support the Marvell PXA168-based
+          Aspenite Development Board.
+
+config MACH_ZYLONITE2
+        bool "Marvell's PXA168 Zylonite2 Development Board"
+        select CPU_PXA168
+        help
+          Say 'Y' here if you want to support the Marvell PXA168-based
+          Zylonite2 Development Board.
+
+config MACH_TAVOREVB
+        bool "Marvell's PXA910 TavorEVB Development Board"
+        select CPU_PXA910
+        help
+          Say 'Y' here if you want to support the Marvell PXA910-based
+          TavorEVB Development Board.
+
+config MACH_TTC_DKB
+        bool "Marvell's PXA910 TavorEVB Development Board"
+        select CPU_PXA910
+        help
+          Say 'Y' here if you want to support the Marvell PXA910-based
+          TTC_DKB Development Board.
+
+endmenu
+
+config CPU_PXA168
+        bool
+        select CPU_MOHAWK
+        help
+          Select code specific to PXA168
+
+config CPU_PXA910
+        bool
+        select CPU_MOHAWK
+        help
+          Select code specific to PXA910
+
+endif