diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 10:34:00 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-07-21 10:34:00 -0400 |
| commit | 1e09939bad24df95ddeeeca4fbec64fa94b66def (patch) | |
| tree | 8a4661ed8c4619db28863353858e0171171b7d8a /arch/arm/Kconfig | |
| parent | 4d09a938861ef16248334d57ae250e109b0004ae (diff) | |
| parent | e8de616e39ccea3b8d3cf7e68f16d216f183c4bf (diff) | |
Merge branch 'next-samsung-devel' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into next/devel
Diffstat (limited to 'arch/arm/Kconfig')
| -rw-r--r-- | arch/arm/Kconfig | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index a9bb43957443..54d63f1e9a91 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
| @@ -684,6 +684,7 @@ config ARCH_S3C2410 | |||
| 684 | select GENERIC_GPIO | 684 | select GENERIC_GPIO |
| 685 | select ARCH_HAS_CPUFREQ | 685 | select ARCH_HAS_CPUFREQ |
| 686 | select HAVE_CLK | 686 | select HAVE_CLK |
| 687 | select CLKDEV_LOOKUP | ||
| 687 | select ARCH_USES_GETTIMEOFFSET | 688 | select ARCH_USES_GETTIMEOFFSET |
| 688 | select HAVE_S3C2410_I2C if I2C | 689 | select HAVE_S3C2410_I2C if I2C |
| 689 | help | 690 | help |
| @@ -701,6 +702,7 @@ config ARCH_S3C64XX | |||
| 701 | select CPU_V6 | 702 | select CPU_V6 |
| 702 | select ARM_VIC | 703 | select ARM_VIC |
| 703 | select HAVE_CLK | 704 | select HAVE_CLK |
| 705 | select CLKDEV_LOOKUP | ||
| 704 | select NO_IOPORT | 706 | select NO_IOPORT |
| 705 | select ARCH_USES_GETTIMEOFFSET | 707 | select ARCH_USES_GETTIMEOFFSET |
| 706 | select ARCH_HAS_CPUFREQ | 708 | select ARCH_HAS_CPUFREQ |
| @@ -725,6 +727,7 @@ config ARCH_S5P64X0 | |||
| 725 | select CPU_V6 | 727 | select CPU_V6 |
| 726 | select GENERIC_GPIO | 728 | select GENERIC_GPIO |
| 727 | select HAVE_CLK | 729 | select HAVE_CLK |
| 730 | select CLKDEV_LOOKUP | ||
| 728 | select HAVE_S3C2410_WATCHDOG if WATCHDOG | 731 | select HAVE_S3C2410_WATCHDOG if WATCHDOG |
| 729 | select GENERIC_CLOCKEVENTS | 732 | select GENERIC_CLOCKEVENTS |
| 730 | select HAVE_SCHED_CLOCK | 733 | select HAVE_SCHED_CLOCK |
| @@ -738,6 +741,7 @@ config ARCH_S5PC100 | |||
| 738 | bool "Samsung S5PC100" | 741 | bool "Samsung S5PC100" |
| 739 | select GENERIC_GPIO | 742 | select GENERIC_GPIO |
| 740 | select HAVE_CLK | 743 | select HAVE_CLK |
| 744 | select CLKDEV_LOOKUP | ||
| 741 | select CPU_V7 | 745 | select CPU_V7 |
| 742 | select ARM_L1_CACHE_SHIFT_6 | 746 | select ARM_L1_CACHE_SHIFT_6 |
| 743 | select ARCH_USES_GETTIMEOFFSET | 747 | select ARCH_USES_GETTIMEOFFSET |
| @@ -751,8 +755,10 @@ config ARCH_S5PV210 | |||
| 751 | bool "Samsung S5PV210/S5PC110" | 755 | bool "Samsung S5PV210/S5PC110" |
| 752 | select CPU_V7 | 756 | select CPU_V7 |
| 753 | select ARCH_SPARSEMEM_ENABLE | 757 | select ARCH_SPARSEMEM_ENABLE |
| 758 | select ARCH_HAS_HOLES_MEMORYMODEL | ||
| 754 | select GENERIC_GPIO | 759 | select GENERIC_GPIO |
| 755 | select HAVE_CLK | 760 | select HAVE_CLK |
| 761 | select CLKDEV_LOOKUP | ||
| 756 | select ARM_L1_CACHE_SHIFT_6 | 762 | select ARM_L1_CACHE_SHIFT_6 |
| 757 | select ARCH_HAS_CPUFREQ | 763 | select ARCH_HAS_CPUFREQ |
| 758 | select GENERIC_CLOCKEVENTS | 764 | select GENERIC_CLOCKEVENTS |
| @@ -767,8 +773,10 @@ config ARCH_EXYNOS4 | |||
| 767 | bool "Samsung EXYNOS4" | 773 | bool "Samsung EXYNOS4" |
| 768 | select CPU_V7 | 774 | select CPU_V7 |
| 769 | select ARCH_SPARSEMEM_ENABLE | 775 | select ARCH_SPARSEMEM_ENABLE |
| 776 | select ARCH_HAS_HOLES_MEMORYMODEL | ||
| 770 | select GENERIC_GPIO | 777 | select GENERIC_GPIO |
| 771 | select HAVE_CLK | 778 | select HAVE_CLK |
| 779 | select CLKDEV_LOOKUP | ||
| 772 | select ARCH_HAS_CPUFREQ | 780 | select ARCH_HAS_CPUFREQ |
| 773 | select GENERIC_CLOCKEVENTS | 781 | select GENERIC_CLOCKEVENTS |
| 774 | select HAVE_S3C_RTC if RTC_CLASS | 782 | select HAVE_S3C_RTC if RTC_CLASS |