diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 19:53:16 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 19:53:16 +0200 |
commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/sh/configs/lboxre2_defconfig | |
parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
download | kernel_samsung_aries-9b610fda0df5d0f0b0c64242e37441ad1b384aac.zip kernel_samsung_aries-9b610fda0df5d0f0b0c64242e37441ad1b384aac.tar.gz kernel_samsung_aries-9b610fda0df5d0f0b0c64242e37441ad1b384aac.tar.bz2 |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'arch/sh/configs/lboxre2_defconfig')
-rw-r--r-- | arch/sh/configs/lboxre2_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/configs/lboxre2_defconfig b/arch/sh/configs/lboxre2_defconfig index 9fa66d9..b68b6cd 100644 --- a/arch/sh/configs/lboxre2_defconfig +++ b/arch/sh/configs/lboxre2_defconfig @@ -231,7 +231,6 @@ CONFIG_CPU_HAS_PTEA=y # CONFIG_SH_TMU=y CONFIG_SH_TIMER_IRQ=16 -# CONFIG_NO_IDLE_HZ is not set CONFIG_SH_PCLK_FREQ=40000000 # |