Merge branches 'core' and 'clks' into devel

diff --combined arch/arm/Kconfig
index 60a09fc,6fe71af..a041997
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -201,7 -201,6 +201,7 @@@ choic
  
  config ARCH_AAEC2000
        bool "Agilent AAEC-2000 based"
 +      select CPU_ARM920T
        select ARM_AMBA
        select HAVE_CLK
        help
@@@ -211,6 -210,7 +211,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.
@@@ -219,6 -219,7 +220,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
@@@ -230,6 -231,7 +232,7 @@@ config ARCH_VERSATIL
        select ARM_AMBA
        select ARM_VIC
        select HAVE_CLK
+       select COMMON_CLKDEV
        select ICST307
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -246,7 -248,6 +249,7 @@@ config ARCH_AT9
  
  config ARCH_CLPS7500
        bool "Cirrus CL-PS7500FE"
 +      select CPU_ARM710
        select TIMER_ACORN
        select ISA
        select NO_IOPORT
@@@ -256,13 -257,11 +259,13 @@@
  
  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
@@@ -273,7 -272,6 +276,7 @@@
  
  config ARCH_EP93XX
        bool "EP93xx-based"
 +      select CPU_ARM920T
        select ARM_AMBA
        select ARM_VIC
        select GENERIC_GPIO
@@@ -284,7 -282,6 +287,7 @@@
  
  config ARCH_FOOTBRIDGE
        bool "FootBridge"
 +      select CPU_SA110
        select FOOTBRIDGE
        help
          Support for systems based on the DC21285 companion chip
@@@ -292,21 -289,18 +295,21 @@@
  
  config ARCH_NETX
        bool "Hilscher NetX based"
 +      select CPU_ARM926T
        select ARM_VIC
        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
@@@ -316,7 -310,6 +319,7 @@@
  config ARCH_IOP13XX
        bool "IOP13xx-based"
        depends on MMU
 +      select CPU_XSC3
        select PLAT_IOP
        select PCI
        select ARCH_SUPPORTS_MSI
@@@ -327,7 -320,6 +330,7 @@@
  config ARCH_IOP32X
        bool "IOP32x-based"
        depends on MMU
 +      select CPU_XSCALE
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO
@@@ -339,7 -331,6 +342,7 @@@
  config ARCH_IOP33X
        bool "IOP33x-based"
        depends on MMU
 +      select CPU_XSCALE
        select PLAT_IOP
        select PCI
        select GENERIC_GPIO
@@@ -350,7 -341,6 +353,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.
@@@ -358,7 -348,6 +361,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.
@@@ -366,7 -355,6 +369,7 @@@
  config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU
 +      select CPU_XSCALE
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -376,7 -364,6 +379,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
@@@ -390,7 -377,6 +393,7 @@@
  
  config ARCH_KIRKWOOD
        bool "Marvell Kirkwood"
 +      select CPU_FEROCEON
        select PCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -401,7 -387,6 +404,7 @@@
  
  config ARCH_KS8695
        bool "Micrel/Kendin KS8695"
 +      select CPU_ARM922T
        select GENERIC_GPIO
        help
          Support for Micrel/Kendin KS8695 "Centaur" (ARM922T) based
@@@ -409,7 -394,6 +412,7 @@@
  
  config ARCH_NS9XXX
        bool "NetSilicon NS9xxx"
 +      select CPU_ARM926T
        select GENERIC_GPIO
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -422,7 -406,6 +425,7 @@@
  
  config ARCH_LOKI
        bool "Marvell Loki (88RC8480)"
 +      select CPU_FEROCEON
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select PLAT_ORION
@@@ -431,7 -414,6 +434,7 @@@
  
  config ARCH_MV78XX0
        bool "Marvell MV78xx0"
 +      select CPU_FEROCEON
        select PCI
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
@@@ -453,7 -435,6 +456,7 @@@ config ARCH_MX
  config ARCH_ORION5X
        bool "Marvell Orion"
        depends on MMU
 +      select CPU_FEROCEON
        select PCI
        select GENERIC_GPIO
        select GENERIC_TIME
@@@ -466,7 -447,6 +469,7 @@@
  
  config ARCH_PNX4008
        bool "Philips Nexperia PNX4008 Mobile"
 +      select CPU_ARM926T
        select HAVE_CLK
        help
          This enables support for Philips PNX4008 mobile platform.
@@@ -477,6 -457,7 +480,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
@@@ -500,7 -481,6 +504,7 @@@ config ARCH_RP
  
  config ARCH_SA1100
        bool "SA1100-based"
 +      select CPU_SA1100
        select ISA
        select ARCH_SPARSEMEM_ENABLE
        select ARCH_MTD_XIP
@@@ -524,7 -504,6 +528,7 @@@ config ARCH_S3C241
  
  config ARCH_SHARK
        bool "Shark"
 +      select CPU_SA110
        select ISA
        select ISA_DMA
        select ZONE_DMA
@@@ -535,7 -514,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
@@@ -546,7 -524,6 +550,7 @@@
  
  config ARCH_DAVINCI
        bool "TI DaVinci"
 +      select CPU_ARM926T
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        select GENERIC_GPIO
@@@ -568,7 -545,6 +572,7 @@@ config ARCH_OMA
  
  config ARCH_MSM
        bool "Qualcomm MSM"
 +      select CPU_V6
        select GENERIC_TIME
        select GENERIC_CLOCKEVENTS
        help