Merge branch 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel...

* 'next/deletion' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc:
  ARM: mach-loki: delete
  ARM: mach-s3c2400: delete
  ARM: mach-s3c24a0: delete

diff --combined arch/arm/Kconfig
index ebaa380,6bbb976..9cb1f4b
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -10,7 -10,7 +10,7 @@@ config AR
        select GENERIC_ATOMIC64 if (CPU_V6 || !CPU_32v6K || !AEABI)
        select HAVE_OPROFILE if (HAVE_PERF_EVENTS)
        select HAVE_ARCH_KGDB
 -      select HAVE_KPROBES if (!XIP_KERNEL && !THUMB2_KERNEL)
 +      select HAVE_KPROBES if !XIP_KERNEL
        select HAVE_KRETPROBES if (HAVE_KPROBES)
        select HAVE_FUNCTION_TRACER if (!XIP_KERNEL)
        select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)
@@@ -37,9 -37,6 +37,9 @@@
          Europe.  There is an ARM Linux project with a web page at
          <http://www.arm.linux.org.uk/>.
  
 +config ARM_HAS_SG_CHAIN
 +      bool
 +
  config HAVE_PWM
        bool
  
@@@ -493,14 -490,6 +493,6 @@@ config ARCH_KIRKWOO
          Support for the following Marvell Kirkwood series SoCs:
          88F6180, 88F6192 and 88F6281.
  
- config ARCH_LOKI
-       bool "Marvell Loki (88RC8480)"
-       select CPU_FEROCEON
-       select GENERIC_CLOCKEVENTS
-       select PLAT_ORION
-       help
-         Support for the Marvell Loki (88RC8480) SoC.
- 
  config ARCH_LPC32XX
        bool "NXP LPC32XX"
        select CLKSRC_MMIO
@@@ -645,7 -634,6 +637,7 @@@ config ARCH_SHMOBIL
        select NO_IOPORT
        select SPARSE_IRQ
        select MULTI_IRQ_HANDLER
 +      select PM_GENERIC_DOMAINS if PM
        help
          Support for Renesas's SH-Mobile and R-Mobile ARM platforms.
  
@@@ -686,7 -674,6 +678,7 @@@ config ARCH_S3C241
        select GENERIC_GPIO
        select ARCH_HAS_CPUFREQ
        select HAVE_CLK
 +      select CLKDEV_LOOKUP
        select ARCH_USES_GETTIMEOFFSET
        select HAVE_S3C2410_I2C if I2C
        help
@@@ -704,7 -691,6 +696,7 @@@ config ARCH_S3C64X
        select CPU_V6
        select ARM_VIC
        select HAVE_CLK
 +      select CLKDEV_LOOKUP
        select NO_IOPORT
        select ARCH_USES_GETTIMEOFFSET
        select ARCH_HAS_CPUFREQ
@@@ -729,8 -715,6 +721,8 @@@ config ARCH_S5P64X
        select CPU_V6
        select GENERIC_GPIO
        select HAVE_CLK
 +      select CLKDEV_LOOKUP
 +      select CLKSRC_MMIO
        select HAVE_S3C2410_WATCHDOG if WATCHDOG
        select GENERIC_CLOCKEVENTS
        select HAVE_SCHED_CLOCK
@@@ -744,7 -728,6 +736,7 @@@ config ARCH_S5PC10
        bool "Samsung S5PC100"
        select GENERIC_GPIO
        select HAVE_CLK
 +      select CLKDEV_LOOKUP
        select CPU_V7
        select ARM_L1_CACHE_SHIFT_6
        select ARCH_USES_GETTIMEOFFSET
@@@ -760,8 -743,6 +752,8 @@@ config ARCH_S5PV21
        select ARCH_SPARSEMEM_ENABLE
        select GENERIC_GPIO
        select HAVE_CLK
 +      select CLKDEV_LOOKUP
 +      select CLKSRC_MMIO
        select ARM_L1_CACHE_SHIFT_6
        select ARCH_HAS_CPUFREQ
        select GENERIC_CLOCKEVENTS
@@@ -778,7 -759,6 +770,7 @@@ config ARCH_EXYNOS
        select ARCH_SPARSEMEM_ENABLE
        select GENERIC_GPIO
        select HAVE_CLK
 +      select CLKDEV_LOOKUP
        select ARCH_HAS_CPUFREQ
        select GENERIC_CLOCKEVENTS
        select HAVE_S3C_RTC if RTC_CLASS
@@@ -864,7 -844,6 +856,7 @@@ config ARCH_OMA
        select HAVE_CLK
        select ARCH_REQUIRE_GPIOLIB
        select ARCH_HAS_CPUFREQ
 +      select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select HAVE_SCHED_CLOCK
        select ARCH_HAS_HOLES_MEMORYMODEL
@@@ -937,8 -916,6 +929,6 @@@ source "arch/arm/mach-kirkwood/Kconfig
  
  source "arch/arm/mach-ks8695/Kconfig"
  
- source "arch/arm/mach-loki/Kconfig"
- 
  source "arch/arm/mach-lpc32xx/Kconfig"
  
  source "arch/arm/mach-msm/Kconfig"
@@@ -982,7 -959,6 +972,6 @@@ source "arch/arm/plat-spear/Kconfig
  source "arch/arm/plat-tcc/Kconfig"
  
  if ARCH_S3C2410
- source "arch/arm/mach-s3c2400/Kconfig"
  source "arch/arm/mach-s3c2410/Kconfig"
  source "arch/arm/mach-s3c2412/Kconfig"
  source "arch/arm/mach-s3c2416/Kconfig"
@@@ -1359,6 -1335,7 +1348,6 @@@ config SMP_ON_U
  
  config HAVE_ARM_SCU
        bool
 -      depends on SMP
        help
          This option enables support for the ARM system coherency unit
  
@@@ -1727,34 -1704,17 +1716,34 @@@ config ZBOOT_RO
          Say Y here if you intend to execute your compressed kernel image
          (zImage) directly from ROM or flash.  If unsure, say N.
  
 +choice
 +      prompt "Include SD/MMC loader in zImage (EXPERIMENTAL)"
 +      depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL
 +      default ZBOOT_ROM_NONE
 +      help
 +        Include experimental SD/MMC loading code in the ROM-able zImage.
 +        With this enabled it is possible to write the the ROM-able zImage
 +        kernel image to an MMC or SD card and boot the kernel straight
 +        from the reset vector. At reset the processor Mask ROM will load
 +        the first part of the the ROM-able zImage which in turn loads the
 +        rest the kernel image to RAM.
 +
 +config ZBOOT_ROM_NONE
 +      bool "No SD/MMC loader in zImage (EXPERIMENTAL)"
 +      help
 +        Do not load image from SD or MMC
 +
  config ZBOOT_ROM_MMCIF
        bool "Include MMCIF loader in zImage (EXPERIMENTAL)"
 -      depends on ZBOOT_ROM && ARCH_SH7372 && EXPERIMENTAL
        help
 -        Say Y here to include experimental MMCIF loading code in the
 -        ROM-able zImage. With this enabled it is possible to write the
 -        the ROM-able zImage kernel image to an MMC card and boot the
 -        kernel straight from the reset vector. At reset the processor
 -        Mask ROM will load the first part of the the ROM-able zImage
 -        which in turn loads the rest the kernel image to RAM using the
 -        MMCIF hardware block.
 +        Load image from MMCIF hardware block.
 +
 +config ZBOOT_ROM_SH_MOBILE_SDHI
 +      bool "Include SuperH Mobile SDHI loader in zImage (EXPERIMENTAL)"
 +      help
 +        Load image from SDHI hardware block
 +
 +endchoice
  
  config CMDLINE
        string "Default kernel command string"
@@@ -1904,6 -1864,10 +1893,6 @@@ config CPU_FREQ_PX
        default y
        select CPU_FREQ_DEFAULT_GOV_USERSPACE
  
 -config CPU_FREQ_S3C64XX
 -      bool "CPUfreq support for Samsung S3C64XX CPUs"
 -      depends on CPU_FREQ && CPU_S3C6410
 -
  config CPU_FREQ_S3C
        bool
        help