diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:39:22 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-09 17:39:22 -0500 |
| commit | 2ac9d7aaccbd598b5bd19ac40761b723bb675442 (patch) | |
| tree | 09132a44e33798aaa5e80f10bf025b510015cab3 /arch/arm/Kconfig | |
| parent | 5ede3ceb7b2c2843e153a1803edbdc8c56655950 (diff) | |
| parent | dcf7ec5ee62a78123057a1e286c88ca739717409 (diff) | |
Merge tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
Driver specific changes
Again, a lot of platforms have changes in here: pxa, samsung, omap,
at91, imx, ...
* tag 'drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (54 commits)
ARM: sa1100: clean up of the clock support
ARM: pxa: add dummy clock for sa1100-rtc
RTC: sa1100: support sa1100, pxa and mmp soc families
RTC: sa1100: remove redundant code of setting alarm
RTC: sa1100: Clean out ost register
Input: zylonite-wm97xx - replace IRQ_GPIO() with gpio_to_irq()
pcmcia: pxa: replace IRQ_GPIO() with gpio_to_irq()
ARM: EXYNOS: Modified files for SPI consolidation work
ARM: S5P64X0: Enable SDHCI support
ARM: S5P64X0: Add lookup of sdhci-s3c clocks using generic names
ARM: S5P64X0: Add HSMMC setup for host Controller
ARM: EXYNOS: Add USB OHCI support to ORIGEN board
USB: Add Samsung Exynos OHCI diver
ARM: EXYNOS: Add USB OHCI support to SMDKV310 board
ARM: EXYNOS: Add USB OHCI device
net: macb: fix build break with !CONFIG_OF
i2c: tegra: Support DVC controller in device tree
i2c: tegra: Add __devinit/exit to probe/remove
net/at91_ether: use gpio_is_valid for phy IRQ line
ARM: at91/net: add macb ethernet controller in 9g45/9g20 DT
...
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 3cddfd87c727..b3d7b77d2d51 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -597,6 +597,7 @@ config ARCH_MMP | |||
| 597 | select ARCH_REQUIRE_GPIOLIB | 597 | select ARCH_REQUIRE_GPIOLIB |
| 598 | select CLKDEV_LOOKUP | 598 | select CLKDEV_LOOKUP |
| 599 | select GENERIC_CLOCKEVENTS | 599 | select GENERIC_CLOCKEVENTS |
| 600 | select GPIO_PXA | ||
| 600 | select HAVE_SCHED_CLOCK | 601 | select HAVE_SCHED_CLOCK |
| 601 | select TICK_ONESHOT | 602 | select TICK_ONESHOT |
| 602 | select PLAT_PXA | 603 | select PLAT_PXA |
| @@ -682,6 +683,7 @@ config ARCH_PXA | |||
| 682 | select CLKSRC_MMIO | 683 | select CLKSRC_MMIO |
| 683 | select ARCH_REQUIRE_GPIOLIB | 684 | select ARCH_REQUIRE_GPIOLIB |
| 684 | select GENERIC_CLOCKEVENTS | 685 | select GENERIC_CLOCKEVENTS |
| 686 | select GPIO_PXA | ||
| 685 | select HAVE_SCHED_CLOCK | 687 | select HAVE_SCHED_CLOCK |
| 686 | select TICK_ONESHOT | 688 | select TICK_ONESHOT |
| 687 | select PLAT_PXA | 689 | select PLAT_PXA |
| @@ -749,7 +751,7 @@ config ARCH_SA1100 | |||
| 749 | select ARCH_HAS_CPUFREQ | 751 | select ARCH_HAS_CPUFREQ |
| 750 | select CPU_FREQ | 752 | select CPU_FREQ |
| 751 | select GENERIC_CLOCKEVENTS | 753 | select GENERIC_CLOCKEVENTS |
| 752 | select HAVE_CLK | 754 | select CLKDEV_LOOKUP |
| 753 | select HAVE_SCHED_CLOCK | 755 | select HAVE_SCHED_CLOCK |
| 754 | select TICK_ONESHOT | 756 | select TICK_ONESHOT |
| 755 | select ARCH_REQUIRE_GPIOLIB | 757 | select ARCH_REQUIRE_GPIOLIB |