diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-03-16 20:01:19 -0500 |
| commit | 23dd64011285010ac291f7dddf6e287bdb43a0ad (patch) | |
| tree | 0e4f4569d38d82f4dceb4150d5ad940e0fd5f24f /arch/sh | |
| parent | 516450179454de9e689e0a53ed8f34b896e8651c (diff) | |
| parent | 485ff09990416c75ae9593ddc71619939ab9dd51 (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/sh')
| -rw-r--r-- | arch/sh/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig index e73621d03a..e9b275d907 100644 --- a/arch/sh/Kconfig +++ b/arch/sh/Kconfig | |||
| @@ -392,9 +392,9 @@ config SH_TMU | |||
| 392 | 392 | ||
| 393 | endmenu | 393 | endmenu |
| 394 | 394 | ||
| 395 | source "arch/sh/boards/renesas/hs7751rvoip/Kconfig" | 395 | #source "arch/sh/boards/renesas/hs7751rvoip/Kconfig" |
| 396 | 396 | ||
| 397 | source "arch/sh/boards/renesas/rts7751r2d/Kconfig" | 397 | #source "arch/sh/boards/renesas/rts7751r2d/Kconfig" |
| 398 | 398 | ||
| 399 | config SH_PCLK_FREQ | 399 | config SH_PCLK_FREQ |
| 400 | int "Peripheral clock frequency (in Hz)" | 400 | int "Peripheral clock frequency (in Hz)" |