diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 21:42:06 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-25 21:42:06 -0400 |
| commit | b18cae4224bde7e5a332c19bc99247b2098ea232 (patch) | |
| tree | 2ffa750e6a043a1dcfccd71588b7d6cfdcad440a /arch/arm/Kconfig | |
| parent | 4833c16dea61cb30d6f77dfec3067a08ba79b361 (diff) | |
| parent | f41649e040b1f63e809fb2adb78ed2f3c3ebbcd0 (diff) | |
Merge branch 'for-next' of git://android.git.kernel.org/kernel/tegra
* 'for-next' of git://android.git.kernel.org/kernel/tegra:
spi: tegra: fix error setting on timeout
spi: add spi_tegra driver
tegra: harmony: enable PCI Express
tegra: add PCI Express support
tegra: add PCI Express clocks
[ARM] tegra: Add APB DMA support
[ARM] tegra: Add cpufreq support
[ARM] tegra: common: Update common clock init table
[ARM] tegra: clock: Add dvfs support, bug fixes, and cleanups
[ARM] tegra: Add support for reading fuses
[ARM] tegra: gpio: Add suspend and wake support
[ARM] tegra: pinmux: add safe values, move tegra2, add suspend
[ARM] tegra: add suspend and mirror irqs to legacy controller
[ARM] tegra: Add legacy irq support
[ARM] tegra: update iomap
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index f401b92a99f5..bf7273f3dc64 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -573,6 +573,7 @@ config ARCH_TEGRA | |||
| 573 | select HAVE_CLK | 573 | select HAVE_CLK |
| 574 | select COMMON_CLKDEV | 574 | select COMMON_CLKDEV |
| 575 | select ARCH_HAS_BARRIERS if CACHE_L2X0 | 575 | select ARCH_HAS_BARRIERS if CACHE_L2X0 |
| 576 | select ARCH_HAS_CPUFREQ | ||
| 576 | help | 577 | help |
| 577 | This enables support for NVIDIA Tegra based systems (Tegra APX, | 578 | This enables support for NVIDIA Tegra based systems (Tegra APX, |
| 578 | Tegra 6xx and Tegra 2 series). | 579 | Tegra 6xx and Tegra 2 series). |