diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:41:04 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-26 20:41:04 -0400 |
commit | 69f1d1a6acbaa7d83ef3f4ee26209c58cd000204 (patch) | |
tree | 12be981f8a123b8361edd64b84fd72f339a9655d /arch/arm/Kconfig | |
parent | 2d86a3f04e345b03d5e429bfe14985ce26bff4dc (diff) | |
parent | 1e09939bad24df95ddeeeca4fbec64fa94b66def (diff) |
Merge branch 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc
* 'next/devel' of ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc: (128 commits)
ARM: S5P64X0: External Interrupt Support
ARM: EXYNOS4: Enable MFC on Samsung NURI
ARM: EXYNOS4: Enable MFC on universal_c210
ARM: S5PV210: Enable MFC on Goni
ARM: S5P: Add support for MFC device
ARM: EXYNOS4: Add support FIMD on SMDKC210
ARM: EXYNOS4: Add platform device and helper functions for FIMD
ARM: EXYNOS4: Add resource definition for FIMD
ARM: EXYNOS4: Change devname for FIMD clkdev
ARM: SAMSUNG: Add IRQ_I2S0 definition
ARM: SAMSUNG: Add platform device for idma
ARM: EXYNOS4: Add more registers to be saved and restored for PM
ARM: EXYNOS4: Add more register addresses of CMU
ARM: EXYNOS4: Add platform device for dwmci driver
ARM: EXYNOS4: configure rtc-s3c on NURI
ARM: EXYNOS4: configure MAX8903 secondary charger on NURI
ARM: EXYNOS4: configure ADC on NURI
ARM: EXYNOS4: configure MAX17042 fuel gauge on NURI
ARM: EXYNOS4: configure regulators and PMIC(MAX8997) on NURI
ARM: EXYNOS4: Increase NR_IRQS for devices with more IRQs
...
Fix up tons of silly conflicts:
- arch/arm/mach-davinci/include/mach/psc.h
- arch/arm/mach-exynos4/Kconfig
- arch/arm/mach-exynos4/mach-smdkc210.c
- arch/arm/mach-exynos4/pm.c
- arch/arm/mach-imx/mm-imx1.c
- arch/arm/mach-imx/mm-imx21.c
- arch/arm/mach-imx/mm-imx25.c
- arch/arm/mach-imx/mm-imx27.c
- arch/arm/mach-imx/mm-imx31.c
- arch/arm/mach-imx/mm-imx35.c
- arch/arm/mach-mx5/mm.c
- arch/arm/mach-s5pv210/mach-goni.c
- arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5cdee4bc181..09ebf0ba64f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -328,7 +328,7 @@ config ARCH_CLPS711X | |||
328 | 328 | ||
329 | config ARCH_CNS3XXX | 329 | config ARCH_CNS3XXX |
330 | bool "Cavium Networks CNS3XXX family" | 330 | bool "Cavium Networks CNS3XXX family" |
331 | select CPU_V6 | 331 | select CPU_V6K |
332 | select GENERIC_CLOCKEVENTS | 332 | select GENERIC_CLOCKEVENTS |
333 | select ARM_GIC | 333 | select ARM_GIC |
334 | select MIGHT_HAVE_PCI | 334 | select MIGHT_HAVE_PCI |
@@ -396,6 +396,7 @@ config ARCH_MXC | |||
396 | select ARCH_REQUIRE_GPIOLIB | 396 | select ARCH_REQUIRE_GPIOLIB |
397 | select CLKDEV_LOOKUP | 397 | select CLKDEV_LOOKUP |
398 | select CLKSRC_MMIO | 398 | select CLKSRC_MMIO |
399 | select GENERIC_IRQ_CHIP | ||
399 | select HAVE_SCHED_CLOCK | 400 | select HAVE_SCHED_CLOCK |
400 | help | 401 | help |
401 | Support for Freescale MXC/iMX-based family of processors | 402 | Support for Freescale MXC/iMX-based family of processors |
@@ -603,7 +604,6 @@ config ARCH_TEGRA | |||
603 | select GENERIC_GPIO | 604 | select GENERIC_GPIO |
604 | select HAVE_CLK | 605 | select HAVE_CLK |
605 | select HAVE_SCHED_CLOCK | 606 | select HAVE_SCHED_CLOCK |
606 | select ARCH_HAS_BARRIERS if CACHE_L2X0 | ||
607 | select ARCH_HAS_CPUFREQ | 607 | select ARCH_HAS_CPUFREQ |
608 | help | 608 | help |
609 | This enables support for NVIDIA Tegra based systems (Tegra APX, | 609 | This enables support for NVIDIA Tegra based systems (Tegra APX, |
@@ -630,6 +630,8 @@ config ARCH_PXA | |||
630 | select TICK_ONESHOT | 630 | select TICK_ONESHOT |
631 | select PLAT_PXA | 631 | select PLAT_PXA |
632 | select SPARSE_IRQ | 632 | select SPARSE_IRQ |
633 | select AUTO_ZRELADDR | ||
634 | select MULTI_IRQ_HANDLER | ||
633 | help | 635 | help |
634 | Support for Intel/Marvell's PXA2xx/PXA3xx processor line. | 636 | Support for Intel/Marvell's PXA2xx/PXA3xx processor line. |
635 | 637 | ||
@@ -768,6 +770,7 @@ config ARCH_S5PV210 | |||
768 | bool "Samsung S5PV210/S5PC110" | 770 | bool "Samsung S5PV210/S5PC110" |
769 | select CPU_V7 | 771 | select CPU_V7 |
770 | select ARCH_SPARSEMEM_ENABLE | 772 | select ARCH_SPARSEMEM_ENABLE |
773 | select ARCH_HAS_HOLES_MEMORYMODEL | ||
771 | select GENERIC_GPIO | 774 | select GENERIC_GPIO |
772 | select HAVE_CLK | 775 | select HAVE_CLK |
773 | select CLKDEV_LOOKUP | 776 | select CLKDEV_LOOKUP |
@@ -786,6 +789,7 @@ config ARCH_EXYNOS4 | |||
786 | bool "Samsung EXYNOS4" | 789 | bool "Samsung EXYNOS4" |
787 | select CPU_V7 | 790 | select CPU_V7 |
788 | select ARCH_SPARSEMEM_ENABLE | 791 | select ARCH_SPARSEMEM_ENABLE |
792 | select ARCH_HAS_HOLES_MEMORYMODEL | ||
789 | select GENERIC_GPIO | 793 | select GENERIC_GPIO |
790 | select HAVE_CLK | 794 | select HAVE_CLK |
791 | select CLKDEV_LOOKUP | 795 | select CLKDEV_LOOKUP |