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

diff --combined arch/arm/Kconfig
index f1a3b10cfa9e850508f6e8e4615e53eac5548ba1,fb2877526d58b8194b2e92839bdf2904dba84e5b..4f870207f496617a4b2cd480f5667ae5ddab2c61
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -156,7 -156,6 +156,6 @@@ config ARCH_MTD_XI
        bool
  
  config GENERIC_HARDIRQS_NO__DO_IRQ
-       bool
        def_bool y
  
  if OPROFILE
@@@ -201,7 -200,6 +200,7 @@@ choic
  
  config ARCH_AAEC2000
        bool "Agilent AAEC-2000 based"
 +      select CPU_ARM920T
        select ARM_AMBA
        select HAVE_CLK
        help
@@@ -211,7 -209,6 +210,7 @@@ config ARCH_INTEGRATO
        bool "ARM Ltd. Integrator family"
        select ARM_AMBA
        select HAVE_CLK
 +      select COMMON_CLKDEV
        select ICST525
        help
          Support for ARM's Integrator platform.
@@@ -220,7 -217,6 +219,7 @@@ config ARCH_REALVIE
        bool "ARM Ltd. RealView family"
        select ARM_AMBA
        select HAVE_CLK
 +      select COMMON_CLKDEV
        select ICST307
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -232,7 -228,6 +231,7 @@@ config ARCH_VERSATIL
        select ARM_AMBA
        select ARM_VIC
        select HAVE_CLK
 +      select COMMON_CLKDEV
        select ICST307
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -247,15 -242,22 +246,15 @@@ config ARCH_AT9
          This enables support for systems based on the Atmel AT91RM9200,
          AT91SAM9 and AT91CAP9 processors.
  
 -config ARCH_CLPS7500
 -      bool "Cirrus CL-PS7500FE"
 -      select TIMER_ACORN
 -      select ISA
 -      select NO_IOPORT
 -      select ARCH_SPARSEMEM_ENABLE
 -      help
 -        Support for the Cirrus Logic PS7500FE system-on-a-chip.
 -
  config ARCH_CLPS711X
        bool "Cirrus Logic CLPS711x/EP721x-based"
 +      select CPU_ARM720T
        help
          Support for Cirrus Logic 711x/721x based boards.
  
  config ARCH_EBSA110
        bool "EBSA-110"
 +      select CPU_SA110
        select ISA
        select NO_IOPORT
        help
@@@ -266,19 -268,16 +265,19 @@@
  
  config ARCH_EP93XX
        bool "EP93xx-based"
 +      select CPU_ARM920T
        select ARM_AMBA
        select ARM_VIC
        select GENERIC_GPIO
        select HAVE_CLK
 +      select COMMON_CLKDEV
        select ARCH_REQUIRE_GPIOLIB
        help
          This enables support for the Cirrus EP93xx series of CPUs.
  
  config ARCH_FOOTBRIDGE
        bool "FootBridge"
 +      select CPU_SA110
        select FOOTBRIDGE
        help
          Support for systems based on the DC21285 companion chip
@@@ -286,21 -285,20 +285,23 @@@
  
  config ARCH_NETX
        bool "Hilscher NetX based"
 +      select CPU_ARM926T
        select ARM_VIC
+       select GENERIC_CLOCKEVENTS
+       select GENERIC_TIME
        help
          This enables support for systems based on the Hilscher NetX Soc
  
  config ARCH_H720X
        bool "Hynix HMS720x-based"
 +      select CPU_ARM720T
        select ISA_DMA_API
        help
          This enables support for systems based on the Hynix HMS720x
  
  config ARCH_IMX
        bool "IMX"
 +      select CPU_ARM920T
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -310,7 -308,6 +311,7 @@@
  config ARCH_IOP13XX
        bool "IOP13xx-based"
        depends on MMU
 +      select CPU_XSC3
        select PLAT_IOP
        select PCI
        select ARCH_SUPPORTS_MSI
@@@ -321,7 -318,6 +322,7 @@@
  config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU
 +      select CPU_XSCALE
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO
@@@ -333,7 -329,6 +334,7 @@@
  config ARCH_IOP33X
        bool "IOP33x-based"
        depends on MMU
 +      select CPU_XSCALE
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO
@@@ -344,7 -339,6 +345,7 @@@
  config ARCH_IXP23XX
        bool "IXP23XX-based"
        depends on MMU
 +      select CPU_XSC3
        select PCI
        help
          Support for Intel's IXP23xx (XScale) family of processors.
@@@ -352,7 -346,6 +353,7 @@@
  config ARCH_IXP2000
        bool "IXP2400/2800-based"
        depends on MMU
 +      select CPU_XSCALE
        select PCI
        help
          Support for Intel's IXP2400/2800 (XScale) family of processors.
@@@ -360,7 -353,6 +361,7 @@@
  config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU
 +      select CPU_XSCALE
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -370,7 -362,6 +371,7 @@@
  
  config ARCH_L7200
        bool "LinkUp-L7200"
 +      select CPU_ARM720T
        select FIQ
        help
          Say Y here if you intend to run this kernel on a LinkUp Systems
@@@ -384,7 -375,6 +385,7 @@@
  
  config ARCH_KIRKWOOD
        bool "Marvell Kirkwood"
 +      select CPU_FEROCEON
        select PCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -395,16 -385,13 +396,16 @@@
  
  config ARCH_KS8695
        bool "Micrel/Kendin KS8695"
 +      select CPU_ARM922T
        select GENERIC_GPIO
 +        select ARCH_REQUIRE_GPIOLIB
        help
          Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
          System-on-Chip devices.
  
  config ARCH_NS9XXX
        bool "NetSilicon NS9xxx"
 +      select CPU_ARM926T
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -417,7 -404,6 +418,7 @@@
  
  config ARCH_LOKI
        bool "Marvell Loki (88RC8480)"
 +      select CPU_FEROCEON
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select PLAT_ORION
@@@ -426,7 -412,6 +427,7 @@@
  
  config ARCH_MV78XX0
        bool "Marvell MV78xx0"
 +      select CPU_FEROCEON
        select PCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -448,7 -433,6 +449,7 @@@ config ARCH_MX
  config ARCH_ORION5X
        bool "Marvell Orion"
        depends on MMU
 +      select CPU_FEROCEON
        select PCI
        select GENERIC_GPIO
        select GENERIC_TIME
@@@ -461,7 -445,6 +462,7 @@@
  
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
 +      select CPU_ARM926T
        select HAVE_CLK
        help
          This enables support for Philips PNX4008 mobile platform.
@@@ -472,7 -455,6 +473,7 @@@ config ARCH_PX
        select ARCH_MTD_XIP
        select GENERIC_GPIO
        select HAVE_CLK
 +      select COMMON_CLKDEV
        select ARCH_REQUIRE_GPIOLIB
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -496,7 -478,6 +497,7 @@@ config ARCH_RP
  
  config ARCH_SA1100
        bool "SA1100-based"
 +      select CPU_SA1100
        select ISA
        select ARCH_SPARSEMEM_ENABLE
        select ARCH_MTD_XIP
@@@ -518,16 -499,8 +519,16 @@@ config ARCH_S3C241
          BAST (<http://www.simtec.co.uk/products/EB110ITX/>), the IPAQ 1940 or
          the Samsung SMDK2410 development board (and derivatives).
  
 +config ARCH_S3C64XX
 +      bool "Samsung S3C64XX"
 +      select GENERIC_GPIO
 +      select HAVE_CLK
 +      help
 +        Samsung S3C64XX series based systems
 +
  config ARCH_SHARK
        bool "Shark"
 +      select CPU_SA110
        select ISA
        select ISA_DMA
        select ZONE_DMA
@@@ -538,7 -511,6 +539,7 @@@
  
  config ARCH_LH7A40X
        bool "Sharp LH7A40X"
 +      select CPU_ARM922T
        select ARCH_DISCONTIGMEM_ENABLE if !LH7A40X_CONTIGMEM
        select ARCH_SPARSEMEM_ENABLE if !LH7A40X_CONTIGMEM
        help
@@@ -549,7 -521,6 +550,7 @@@
  
  config ARCH_DAVINCI
        bool "TI DaVinci"
 +      select CPU_ARM926T
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
@@@ -571,7 -542,6 +572,7 @@@ config ARCH_OMA
  
  config ARCH_MSM
        bool "Qualcomm MSM"
 +      select CPU_V6
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help
@@@ -580,13 -550,6 +581,13 @@@
          interface to the ARM9 modem processor which runs the baseband stack
          and controls some vital subsystems (clock and power control, etc).
  
 +config ARCH_W90X900
 +      bool "Nuvoton W90X900 CPU"
 +      select CPU_ARM926T
 +      help
 +              Support for Nuvoton (Winbond logic dept.) ARM9 processor,You
 +              can login www.mcuos.com or www.nuvoton.com to know more.
 +
  endchoice
  
  source "arch/arm/mach-clps711x/Kconfig"
@@@ -628,7 -591,6 +629,7 @@@ source "arch/arm/mach-orion5x/Kconfig
  source "arch/arm/mach-kirkwood/Kconfig"
  
  source "arch/arm/plat-s3c24xx/Kconfig"
 +source "arch/arm/plat-s3c64xx/Kconfig"
  source "arch/arm/plat-s3c/Kconfig"
  
  if ARCH_S3C2410
@@@ -640,11 -602,6 +641,11 @@@ source "arch/arm/mach-s3c2442/Kconfig
  source "arch/arm/mach-s3c2443/Kconfig"
  endif
  
 +if ARCH_S3C64XX
 +source "arch/arm/mach-s3c6400/Kconfig"
 +source "arch/arm/mach-s3c6410/Kconfig"
 +endif
 +
  source "arch/arm/mach-lh7a40x/Kconfig"
  
  source "arch/arm/mach-imx/Kconfig"
@@@ -671,8 -628,6 +672,8 @@@ source "arch/arm/mach-ks8695/Kconfig
  
  source "arch/arm/mach-msm/Kconfig"
  
 +source "arch/arm/mach-w90x900/Kconfig"
 +
  # Definitions to make life easier
  config ARCH_ACORN
        bool
@@@ -827,7 -782,7 +828,7 @@@ config HOTPLUG_CP
  
  config LOCAL_TIMERS
        bool "Use local timer interrupts"
 -      depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP)
 +      depends on SMP && (REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || REALVIEW_EB_A9MP)
        default y
        help
          Enable support for local timers on SMP platforms, rather then the