1 files changed, 4 insertions, 35 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 1ad6fb6c094d..e98261cb05bd 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -358,7 +358,6 @@ config ARCH_AT91
         bool "Atmel AT91"
         select ARCH_REQUIRE_GPIOLIB
         select CLKDEV_LOOKUP
-        select HAVE_CLK
         select IRQ_DOMAIN
         select NEED_MACH_GPIO_H
         select NEED_MACH_IO_H if PCCARD
@@ -372,7 +371,6 @@ config ARCH_CLPS711X
         bool "Cirrus Logic CLPS711x/EP721x/EP731x-based"
         select ARCH_REQUIRE_GPIOLIB
         select AUTO_ZRELADDR
-        select CLKDEV_LOOKUP
         select CLKSRC_MMIO
         select COMMON_CLK
         select CPU_ARM720T
@@ -386,8 +384,9 @@ config ARCH_CLPS711X
 config ARCH_GEMINI
         bool "Cortina Systems Gemini"
         select ARCH_REQUIRE_GPIOLIB
-        select ARCH_USES_GETTIMEOFFSET
+        select CLKSRC_MMIO
         select CPU_FA526
+        select GENERIC_CLOCKEVENTS
         select NEED_MACH_GPIO_H
         help
           Support for the Cortina Systems Gemini family SoCs
@@ -631,7 +630,6 @@ config ARCH_PXA
 config ARCH_MSM
         bool "Qualcomm MSM"
         select ARCH_REQUIRE_GPIOLIB
-        select CLKDEV_LOOKUP
         select CLKSRC_OF if OF
         select COMMON_CLK
         select GENERIC_CLOCKEVENTS
@@ -649,7 +647,6 @@ config ARCH_SHMOBILE
         select GENERIC_CLOCKEVENTS
         select HAVE_ARM_SCU if SMP
         select HAVE_ARM_TWD if SMP
-        select HAVE_CLK
         select HAVE_MACH_CLKDEV
         select HAVE_SMP
         select MIGHT_HAVE_CACHE_L2X0
@@ -706,7 +703,6 @@ config ARCH_S3C24XX
         select CLKSRC_SAMSUNG_PWM
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
-        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_S3C_RTC if RTC_CLASS
@@ -730,18 +726,19 @@ config ARCH_S3C64XX
         select CPU_V6
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
-        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_TCM
         select NEED_MACH_GPIO_H
         select NO_IOPORT
         select PLAT_SAMSUNG
+        select PM_GENERIC_DOMAINS
         select S3C_DEV_NAND
         select S3C_GPIO_TRACK
         select SAMSUNG_ATAGS
         select SAMSUNG_CLKSRC
         select SAMSUNG_GPIOLIB_4BIT
+        select SAMSUNG_WAKEMASK
         select SAMSUNG_WDT_RESET
         select USB_ARCH_HAS_OHCI
         help
@@ -754,7 +751,6 @@ config ARCH_S5P64X0
         select CPU_V6
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
-        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_S3C_RTC if RTC_CLASS
@@ -773,7 +769,6 @@ config ARCH_S5PC100
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
-        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_S3C_RTC if RTC_CLASS
@@ -793,7 +788,6 @@ config ARCH_S5PV210
         select CPU_V7
         select GENERIC_CLOCKEVENTS
         select GPIO_SAMSUNG
-        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_S3C_RTC if RTC_CLASS
@@ -810,11 +804,9 @@ config ARCH_EXYNOS
         select ARCH_REQUIRE_GPIOLIB
         select ARCH_SPARSEMEM_ENABLE
         select ARM_GIC
-        select CLKDEV_LOOKUP
         select COMMON_CLK
         select CPU_V7
         select GENERIC_CLOCKEVENTS
-        select HAVE_CLK
         select HAVE_S3C2410_I2C if I2C
         select HAVE_S3C2410_WATCHDOG if WATCHDOG
         select HAVE_S3C_RTC if RTC_CLASS
@@ -824,20 +816,6 @@ config ARCH_EXYNOS
         help
           Support for SAMSUNG's EXYNOS SoCs (EXYNOS4/5)
 
-config ARCH_SHARK
-        bool "Shark"
-        select ARCH_USES_GETTIMEOFFSET
-        select CPU_SA110
-        select ISA
-        select ISA_DMA
-        select NEED_MACH_MEMORY_H
-        select PCI
-        select VIRT_TO_BUS
-        select ZONE_DMA
-        help
-          Support for the StrongARM based Digital DNARD machine, also known
-          as "Shark" (<http://www.shark-linux.de/shark.html>).
-
 config ARCH_DAVINCI
         bool "TI DaVinci"
         select ARCH_HAS_HOLES_MEMORYMODEL
@@ -865,7 +843,6 @@ config ARCH_OMAP1
         select CLKSRC_MMIO
         select GENERIC_CLOCKEVENTS
         select GENERIC_IRQ_CHIP
-        select HAVE_CLK
         select HAVE_IDE
         select IRQ_DOMAIN
         select NEED_MACH_IO_H if PCCARD
@@ -1009,9 +986,7 @@ source "arch/arm/mach-sti/Kconfig"
 
 source "arch/arm/mach-s3c24xx/Kconfig"
 
-if ARCH_S3C64XX
 source "arch/arm/mach-s3c64xx/Kconfig"
-endif
 
 source "arch/arm/mach-s5p64x0/Kconfig"
 
@@ -1431,12 +1406,6 @@ config PCI_NANOENGINE
 config PCI_SYSCALL
         def_bool PCI
 
-# Select the host bridge type
-config PCI_HOST_VIA82C505
-        bool
-        depends on PCI && ARCH_SHARK
-        default y
-
 config PCI_HOST_ITE8152
         bool
         depends on PCI && MACH_ARMCORE