diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:50:34 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 22:50:34 +0200 |
commit | a208f37a465e222218974ab20a31b42b7b4893b2 (patch) | |
tree | 77c6acdd4be32024330a14f2618b814126ce7a20 /arch/sh/configs/se7712_defconfig | |
parent | 511d9d34183662aada3890883e860b151d707e22 (diff) | |
parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
download | talos-obmc-linux-a208f37a465e222218974ab20a31b42b7b4893b2.tar.gz talos-obmc-linux-a208f37a465e222218974ab20a31b42b7b4893b2.zip |
Merge branch 'linus' into x86/x2apic
Diffstat (limited to 'arch/sh/configs/se7712_defconfig')
-rw-r--r-- | arch/sh/configs/se7712_defconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/sh/configs/se7712_defconfig b/arch/sh/configs/se7712_defconfig index 240a1cef69aa..2dd83af988f0 100644 --- a/arch/sh/configs/se7712_defconfig +++ b/arch/sh/configs/se7712_defconfig @@ -236,7 +236,6 @@ CONFIG_CPU_HAS_SR_RB=y # CONFIG_SH_TMU=y CONFIG_SH_TIMER_IRQ=16 -# CONFIG_NO_IDLE_HZ is not set CONFIG_SH_PCLK_FREQ=66666666 # |