Merge branch 'for-rmk-devel' of git://git.pengutronix.de/git/imx/linux-2.6 into devel

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile

diff --cc arch/arm/Kconfig
index a930e5c,be680f3..c52f690
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -292,16 -292,6 +292,17 @@@ config ARCH_FOOTBRIDG
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
  
 +config ARCH_MXC
 +      bool "Freescale MXC/iMX-based"
 +      select GENERIC_TIME
 +      select GENERIC_CLOCKEVENTS
 +      select ARCH_MTD_XIP
 +      select GENERIC_GPIO
 +      select ARCH_REQUIRE_GPIOLIB
++      select HAVE_CLK
 +      help
 +        Support for Freescale MXC/iMX-based family of processors
 +
  config ARCH_NETX
        bool "Hilscher NetX based"
        select CPU_ARM926T

diff --cc arch/arm/Makefile
index 885a837,921a627..b6b9f6e
--- 1/arch/arm/Makefile
--- 2/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@@ -99,69 -99,63 +99,68 @@@ CHECKFLAGS += -D__arm_
  #Default value
  head-y                := arch/arm/kernel/head$(MMUEXT).o arch/arm/kernel/init_task.o
  textofs-y     := 0x00008000
 -
 - machine-$(CONFIG_ARCH_RPC)      := rpc
 - machine-$(CONFIG_ARCH_EBSA110)          := ebsa110
 - machine-$(CONFIG_FOOTBRIDGE)    := footbridge
 - machine-$(CONFIG_ARCH_SHARK)    := shark
 - machine-$(CONFIG_ARCH_SA1100)           := sa1100
 -ifeq ($(CONFIG_ARCH_SA1100),y)
 +textofs-$(CONFIG_ARCH_CLPS711X) := 0x00028000
  # SA1111 DMA bug: we don't want the kernel to live in precious DMA-able memory
 - textofs-$(CONFIG_SA1111)        := 0x00208000
 +ifeq ($(CONFIG_ARCH_SA1100),y)
 +textofs-$(CONFIG_SA1111) := 0x00208000
  endif
 - machine-$(CONFIG_ARCH_PXA)      := pxa
 - machine-$(CONFIG_ARCH_MMP)      := mmp
 -    plat-$(CONFIG_PLAT_PXA)      := pxa
 - machine-$(CONFIG_ARCH_L7200)    := l7200
 - machine-$(CONFIG_ARCH_INTEGRATOR) := integrator
 - machine-$(CONFIG_ARCH_GEMINI)     := gemini
 - textofs-$(CONFIG_ARCH_CLPS711X)   := 0x00028000
 - machine-$(CONFIG_ARCH_CLPS711X)   := clps711x
 - machine-$(CONFIG_ARCH_IOP32X)           := iop32x
 - machine-$(CONFIG_ARCH_IOP33X)           := iop33x
 - machine-$(CONFIG_ARCH_IOP13XX)          := iop13xx
 -    plat-$(CONFIG_PLAT_IOP)      := iop
 - machine-$(CONFIG_ARCH_IXP4XX)           := ixp4xx
 - machine-$(CONFIG_ARCH_IXP2000)    := ixp2000
 - machine-$(CONFIG_ARCH_IXP23XX)    := ixp23xx
 - machine-$(CONFIG_ARCH_OMAP1)    := omap1
 - machine-$(CONFIG_ARCH_OMAP2)    := omap2
 - machine-$(CONFIG_ARCH_OMAP3)    := omap2
 -    plat-$(CONFIG_ARCH_OMAP)     := omap
 - machine-$(CONFIG_ARCH_S3C2410)          := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
 - machine-$(CONFIG_ARCH_S3C24A0)          := s3c24a0
 -    plat-$(CONFIG_PLAT_S3C24XX)          := s3c24xx s3c
 - machine-$(CONFIG_ARCH_S3C64XX)          := s3c6400 s3c6410
 -    plat-$(CONFIG_PLAT_S3C64XX)          := s3c64xx s3c
 - machine-$(CONFIG_ARCH_LH7A40X)          := lh7a40x
 - machine-$(CONFIG_ARCH_VERSATILE)  := versatile
 - machine-$(CONFIG_ARCH_H720X)    := h720x
 - machine-$(CONFIG_ARCH_AAEC2000)   := aaec2000
 - machine-$(CONFIG_ARCH_REALVIEW)   := realview
 - machine-$(CONFIG_ARCH_AT91)     := at91
 - machine-$(CONFIG_ARCH_EP93XX)           := ep93xx
 - machine-$(CONFIG_ARCH_PNX4008)          := pnx4008
 - machine-$(CONFIG_ARCH_NETX)     := netx
 - machine-$(CONFIG_ARCH_NS9XXX)           := ns9xxx
 - machine-$(CONFIG_ARCH_DAVINCI)          := davinci
 - machine-$(CONFIG_ARCH_KIRKWOOD)   := kirkwood
 - machine-$(CONFIG_ARCH_KS8695)     := ks8695
 -    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
 - machine-$(CONFIG_ARCH_LOKI)       := loki
 - machine-$(CONFIG_ARCH_MV78XX0)    := mv78xx0
 - machine-$(CONFIG_ARCH_W90X900)    := w90x900
 +
 +# Machine directory name.  This list is sorted alphanumerically
 +# by CONFIG_* macro name.
 +machine-$(CONFIG_ARCH_AAEC2000)               := aaec2000
 +machine-$(CONFIG_ARCH_AT91)           := at91
 +machine-$(CONFIG_ARCH_CLPS711X)               := clps711x
 +machine-$(CONFIG_ARCH_DAVINCI)                := davinci
 +machine-$(CONFIG_ARCH_EBSA110)                := ebsa110
 +machine-$(CONFIG_ARCH_EP93XX)         := ep93xx
 +machine-$(CONFIG_ARCH_GEMINI)         := gemini
 +machine-$(CONFIG_ARCH_H720X)          := h720x
- machine-$(CONFIG_ARCH_IMX)            := imx
 +machine-$(CONFIG_ARCH_INTEGRATOR)     := integrator
 +machine-$(CONFIG_ARCH_IOP13XX)                := iop13xx
 +machine-$(CONFIG_ARCH_IOP32X)         := iop32x
 +machine-$(CONFIG_ARCH_IOP33X)         := iop33x
 +machine-$(CONFIG_ARCH_IXP2000)                := ixp2000
 +machine-$(CONFIG_ARCH_IXP23XX)                := ixp23xx
 +machine-$(CONFIG_ARCH_IXP4XX)         := ixp4xx
 +machine-$(CONFIG_ARCH_KIRKWOOD)               := kirkwood
 +machine-$(CONFIG_ARCH_KS8695)         := ks8695
 +machine-$(CONFIG_ARCH_L7200)          := l7200
 +machine-$(CONFIG_ARCH_LH7A40X)                := lh7a40x
 +machine-$(CONFIG_ARCH_LOKI)           := loki
 +machine-$(CONFIG_ARCH_MMP)            := mmp
 +machine-$(CONFIG_ARCH_MSM)            := msm
 +machine-$(CONFIG_ARCH_MV78XX0)                := mv78xx0
 +machine-$(CONFIG_ARCH_MX1)            := mx1
 +machine-$(CONFIG_ARCH_MX2)            := mx2
 +machine-$(CONFIG_ARCH_MX3)            := mx3
 +machine-$(CONFIG_ARCH_NETX)           := netx
 +machine-$(CONFIG_ARCH_NS9XXX)         := ns9xxx
 +machine-$(CONFIG_ARCH_OMAP1)          := omap1
 +machine-$(CONFIG_ARCH_OMAP2)          := omap2
 +machine-$(CONFIG_ARCH_OMAP3)          := omap2
 +machine-$(CONFIG_ARCH_ORION5X)                := orion5x
 +machine-$(CONFIG_ARCH_PNX4008)                := pnx4008
 +machine-$(CONFIG_ARCH_PXA)            := pxa
 +machine-$(CONFIG_ARCH_REALVIEW)               := realview
 +machine-$(CONFIG_ARCH_RPC)            := rpc
 +machine-$(CONFIG_ARCH_S3C2410)                := s3c2410 s3c2400 s3c2412 s3c2440 s3c2442 s3c2443
 +machine-$(CONFIG_ARCH_S3C24A0)                := s3c24a0
 +machine-$(CONFIG_ARCH_S3C64XX)                := s3c6400 s3c6410
 +machine-$(CONFIG_ARCH_SA1100)         := sa1100
 +machine-$(CONFIG_ARCH_SHARK)          := shark
 +machine-$(CONFIG_ARCH_VERSATILE)      := versatile
 +machine-$(CONFIG_ARCH_W90X900)                := w90x900
 +machine-$(CONFIG_FOOTBRIDGE)          := footbridge
 +
 +# Platform directory name.  This list is sorted alphanumerically
 +# by CONFIG_* macro name.
 +plat-$(CONFIG_ARCH_MXC)               := mxc
 +plat-$(CONFIG_ARCH_OMAP)      := omap
 +plat-$(CONFIG_PLAT_IOP)               := iop
 +plat-$(CONFIG_PLAT_ORION)     := orion
 +plat-$(CONFIG_PLAT_PXA)               := pxa
 +plat-$(CONFIG_PLAT_S3C24XX)   := s3c24xx s3c
 +plat-$(CONFIG_PLAT_S3C64XX)   := s3c64xx s3c
  
  ifeq ($(CONFIG_ARCH_EBSA110),y)
  # This is what happens if you forget the IOCS16 line.