[ARM] Merge AT91 and devel branches

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

diff --combined arch/arm/Kconfig
index aa1d400d721a662f3dbae57a3cb9eea8bc6b6522,43bd17bfc381fd20875d901b0f20c64bffdb53f6,63e7c0c582df39ebd3dd24d2efc705e47b8467bd..6783c2e5512de6e75bed91d55a45ff0c14ee0cf5
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@ -74,14 -74,6 -74,6 +74,14 @@@@ config RWSEM_GENERIC_SPINLOC
   config RWSEM_XCHGADD_ALGORITHM
        bool
   
 ++config ARCH_HAS_ILOG2_U32
 ++     bool
 ++     default n
 ++
 ++config ARCH_HAS_ILOG2_U64
 ++     bool
 ++     default n
 ++
   config GENERIC_HWEIGHT
        bool
        default y
@@@@ -231,12 -223,6 -223,12 +231,12 @@@@ config ARCH_IOP33
        help
          Support for Intel's IOP33X (XScale) family of processors.
   
 + config ARCH_IOP13XX
 +      bool "IOP13xx-based"
 +      select PCI
 +      help
 +        Support for Intel's IOP13XX (XScale) family of processors.
 + 
   config ARCH_IXP4XX
        bool "IXP4xx-based"
        depends on MMU
@@@@ -345,8 -331,6 -337,8 +345,8 @@@@ source "arch/arm/mach-iop32x/Kconfig
   
   source "arch/arm/mach-iop33x/Kconfig"
   
 + source "arch/arm/mach-iop13xx/Kconfig"
 + 
   source "arch/arm/mach-ixp4xx/Kconfig"
   
   source "arch/arm/mach-ixp2000/Kconfig"
@@@@ -390,14 -374,6 -382,14 +390,14 @@@@ config PLAT_IO
   
   source arch/arm/mm/Kconfig
   
 + config IWMMXT
 +      bool "Enable iWMMXt support"
 +      depends CPU_XSCALE || CPU_XSC3
 +      default y if PXA27x
 +      help
 +        Enable support for iWMMXt context switching at run time if
 +        running on a CPU that supports it.
 + 
   #  bool 'Use XScale PMU as timer source' CONFIG_XSCALE_PMU_TIMER
   config XSCALE_PMU
        bool
@@@@ -740,7 -716,7 -732,7 +740,7 @@@@ config XIP_PHYS_ADD
   
   endmenu
   
-- if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP)
++ if (ARCH_SA1100 || ARCH_INTEGRATOR || ARCH_OMAP || ARCH_IMX )
   
   menu "CPU Frequency scaling"
   
@@@@ -767,6 -743,6 -759,15 +767,15 @@@@ config CPU_FREQ_INTEGRATO
   
          If in doubt, say Y.
   
++ config CPU_FREQ_IMX
++      tristate "CPUfreq driver for i.MX CPUs"
++      depends on ARCH_IMX && CPU_FREQ
++      default n
++      help
++        This enables the CPUfreq driver for i.MX CPUs.
++ 
++        If in doubt, say N.
++ 
   endmenu
   
   endif
@@@@ -945,6 -921,6 -946,8 +954,8 @@@@ source "drivers/video/Kconfig
   
   source "sound/Kconfig"
   
++ source "drivers/hid/Kconfig"
++ 
   source "drivers/usb/Kconfig"
   
   source "drivers/mmc/Kconfig"