diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-29 05:54:24 -0400 |
| commit | 3825c9e8d01e4310c40a3903a354c433c32a7b6f (patch) | |
| tree | 87c94a8076bbb38bd2cf20ab9bc23d6f74f6a0a8 /arch/sh/Kconfig.debug | |
| parent | 5d7b605245b1aa1a9cd6549b1f57d69273eb0c37 (diff) | |
| parent | 6e86841d05f371b5b9b86ce76c02aaee83352298 (diff) | |
Merge commit 'v2.6.27-rc1' into x86/microcode
Conflicts:
arch/x86/kernel/microcode.c
Manual resolutions:
arch/x86/kernel/microcode_amd.c
arch/x86/kernel/microcode_intel.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
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 |