diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-31 06:38:04 -0400 |
| commit | 5fbf24659b75356e2142e1f1b88f67b34cbc3e75 (patch) | |
| tree | 0e470e4cc89b72e3d74939f8c39396a6a0bebb3a /arch/sh/Kconfig.debug | |
| parent | d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge branch 'linus' into x86/xen
Diffstat (limited to 'arch/sh/Kconfig.debug')
| -rw-r--r-- | arch/sh/Kconfig.debug | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/sh/Kconfig.debug b/arch/sh/Kconfig.debug index 0f4549860226..36f4b1f7066d 100644 --- a/arch/sh/Kconfig.debug +++ b/arch/sh/Kconfig.debug | |||
| @@ -36,7 +36,8 @@ config EARLY_SCIF_CONSOLE_PORT | |||
| 36 | default "0xff804000" if CPU_SUBTYPE_MXG | 36 | default "0xff804000" if CPU_SUBTYPE_MXG |
| 37 | default "0xffc30000" if CPU_SUBTYPE_SHX3 | 37 | default "0xffc30000" if CPU_SUBTYPE_SHX3 |
| 38 | default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \ | 38 | default "0xffe00000" if CPU_SUBTYPE_SH7780 || CPU_SUBTYPE_SH7763 || \ |
| 39 | CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 | 39 | CPU_SUBTYPE_SH7722 || CPU_SUBTYPE_SH7366 || \ |
| 40 | CPU_SUBTYPE_SH7343 | ||
| 40 | default "0xffe80000" if CPU_SH4 | 41 | default "0xffe80000" if CPU_SH4 |
| 41 | default "0xffea0000" if CPU_SUBTYPE_SH7785 | 42 | default "0xffea0000" if CPU_SUBTYPE_SH7785 |
| 42 | default "0xfffe8000" if CPU_SUBTYPE_SH7203 | 43 | default "0xfffe8000" if CPU_SUBTYPE_SH7203 |