diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
| commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
| tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/sh/configs/lboxre2_defconfig | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
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 9fa66d92a4e7..b68b6cdbb78f 100644 --- a/arch/sh/configs/lboxre2_defconfig +++ b/arch/sh/configs/lboxre2_defconfig | |||
| @@ -231,7 +231,6 @@ CONFIG_CPU_HAS_PTEA=y | |||
| 231 | # | 231 | # |
| 232 | CONFIG_SH_TMU=y | 232 | CONFIG_SH_TMU=y |
| 233 | CONFIG_SH_TIMER_IRQ=16 | 233 | CONFIG_SH_TIMER_IRQ=16 |
| 234 | # CONFIG_NO_IDLE_HZ is not set | ||
| 235 | CONFIG_SH_PCLK_FREQ=40000000 | 234 | CONFIG_SH_PCLK_FREQ=40000000 |
| 236 | 235 | ||
| 237 | # | 236 | # |