aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/Kconfig
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 14:19:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-07-31 14:19:22 +0100
commitf13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0 (patch)
tree44419bd03c33e662302dd003f57d36e133144f91 /arch/arm/Kconfig
parente910b63d009701ad4ebbeb089aba35707fa5d68e (diff)
parent5da3e714e30d40145f4dd37d79de6bbbcb9e6137 (diff)
downloadkernel_samsung_smdk4412-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.zip
kernel_samsung_smdk4412-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.tar.gz
kernel_samsung_smdk4412-f13b1035ce8bbc27d4ce7c281cddd2718f2cf5b0.tar.bz2
Merge branch 'shmobile' into devel
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r--arch/arm/Kconfig1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 78589a1..34cef25 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1173,6 +1173,7 @@ config HZ
default 200 if ARCH_EBSA110 || ARCH_S3C2410 || ARCH_S5P6440 || ARCH_S5P6442 || ARCH_S5PV210
default OMAP_32K_TIMER_HZ if ARCH_OMAP && OMAP_32K_TIMER
default AT91_TIMER_HZ if ARCH_AT91
+ default SHMOBILE_TIMER_HZ if ARCH_SHMOBILE
default 100
config THUMB2_KERNEL