diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 01:44:51 -0400 |
| commit | 43d2548bb2ef7e6d753f91468a746784041e522d (patch) | |
| tree | 77d13fcd48fd998393abb825ec36e2b732684a73 /arch/sh/configs/se7712_defconfig | |
| parent | 585583d95c5660973bc0cf64add517b040acd8a4 (diff) | |
| parent | 85082fd7cbe3173198aac0eb5e85ab1edcc6352c (diff) | |
Merge commit '85082fd7cbe3173198aac0eb5e85ab1edcc6352c' into test-build
Manual fixup of:
arch/powerpc/Kconfig
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 | |||
| 236 | # | 236 | # |
| 237 | CONFIG_SH_TMU=y | 237 | CONFIG_SH_TMU=y |
| 238 | CONFIG_SH_TIMER_IRQ=16 | 238 | CONFIG_SH_TIMER_IRQ=16 |
| 239 | # CONFIG_NO_IDLE_HZ is not set | ||
| 240 | CONFIG_SH_PCLK_FREQ=66666666 | 239 | CONFIG_SH_PCLK_FREQ=66666666 |
| 241 | 240 | ||
| 242 | # | 241 | # |