From: Arnd Bergmann Date: Thu, 21 Jul 2011 14:34:00 +0000 (+0200) Subject: Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git... X-Git-Tag: master-2011-08-08~79^2 X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=1e09939bad24df95ddeeeca4fbec64fa94b66def;hp=-c;p=~andy%2Flinux Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/devel --- 1e09939bad24df95ddeeeca4fbec64fa94b66def diff --combined arch/arm/Kconfig index a9bb4395744,b0f9ddbffd5..54d63f1e9a9 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@@ -321,7 -321,7 +321,7 @@@ config ARCH_CLPS711 config ARCH_CNS3XXX bool "Cavium Networks CNS3XXX family" - select CPU_V6 + select CPU_V6K select GENERIC_CLOCKEVENTS select ARM_GIC select MIGHT_HAVE_PCI @@@ -376,7 -376,6 +376,7 @@@ config ARCH_MX select ARCH_REQUIRE_GPIOLIB select CLKDEV_LOOKUP select CLKSRC_MMIO + select GENERIC_IRQ_CHIP select HAVE_SCHED_CLOCK help Support for Freescale MXC/iMX-based family of processors @@@ -592,6 -591,7 +592,6 @@@ config ARCH_TEGR select GENERIC_GPIO select HAVE_CLK select HAVE_SCHED_CLOCK - select ARCH_HAS_BARRIERS if CACHE_L2X0 select ARCH_HAS_CPUFREQ help This enables support for NVIDIA Tegra based systems (Tegra APX, @@@ -618,8 -618,6 +618,8 @@@ config ARCH_PX select TICK_ONESHOT select PLAT_PXA select SPARSE_IRQ + select AUTO_ZRELADDR + select MULTI_IRQ_HANDLER help Support for Intel/Marvell's PXA2xx/PXA3xx processor line. @@@ -684,6 -682,7 +684,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 @@@ -701,6 -700,7 +702,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 @@@ -725,6 -725,7 +727,7 @@@ config ARCH_S5P64X select CPU_V6 select GENERIC_GPIO select HAVE_CLK + select CLKDEV_LOOKUP select HAVE_S3C2410_WATCHDOG if WATCHDOG select GENERIC_CLOCKEVENTS select HAVE_SCHED_CLOCK @@@ -738,6 -739,7 +741,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 @@@ -751,8 -753,10 +755,10 @@@ config ARCH_S5PV21 bool "Samsung S5PV210/S5PC110" select CPU_V7 select ARCH_SPARSEMEM_ENABLE + select ARCH_HAS_HOLES_MEMORYMODEL select GENERIC_GPIO select HAVE_CLK + select CLKDEV_LOOKUP select ARM_L1_CACHE_SHIFT_6 select ARCH_HAS_CPUFREQ select GENERIC_CLOCKEVENTS @@@ -767,8 -771,10 +773,10 @@@ config ARCH_EXYNOS bool "Samsung EXYNOS4" select CPU_V7 select ARCH_SPARSEMEM_ENABLE + select ARCH_HAS_HOLES_MEMORYMODEL select GENERIC_GPIO select HAVE_CLK + select CLKDEV_LOOKUP select ARCH_HAS_CPUFREQ select GENERIC_CLOCKEVENTS select HAVE_S3C_RTC if RTC_CLASS