diff options
| author | Kumar Gala <galak@gate.crashing.org> | 2005-12-21 09:27:13 -0600 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 15:34:31 +1100 |
| commit | 79e7bac0d6ad56d62e2364313b5e5e5950c7385d (patch) | |
| tree | c20bbb30659be4f76a3599ffb519a6518e94e146 /arch | |
| parent | be6b843918394067e93ebbacb834245251a6f18a (diff) | |
| download | kernel-common-79e7bac0d6ad56d62e2364313b5e5e5950c7385d.tar.gz kernel-common-79e7bac0d6ad56d62e2364313b5e5e5950c7385d.tar.bz2 kernel-common-79e7bac0d6ad56d62e2364313b5e5e5950c7385d.zip | |
[PATCH] powerpc: Call find_legacy_serial_ports() if we enable CONFIG_SERIAL_8250
In setup_arch and setup_system call find_legacy_serial_ports() if we
build in support for 8250 serial ports instead of basing it on PPC_MULTIPLATFORM.
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/powerpc/kernel/Makefile | 3 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_32.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/kernel/setup_64.c | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/Makefile b/arch/powerpc/kernel/Makefile index 5bdc5faac713..a852b379d9eb 100644 --- a/arch/powerpc/kernel/Makefile +++ b/arch/powerpc/kernel/Makefile @@ -56,8 +56,7 @@ obj-$(CONFIG_BOOTX_TEXT) += btext.o obj-$(CONFIG_6xx) += idle_6xx.o obj-$(CONFIG_SMP) += smp.o obj-$(CONFIG_KPROBES) += kprobes.o -obj-$(CONFIG_PPC_MULTIPLATFORM) += legacy_serial.o -obj-$(CONFIG_PPC_MULTIPLATFORM) += udbg_16550.o +obj-$(CONFIG_SERIAL_8250) += legacy_serial.o udbg_16550.o module-$(CONFIG_PPC64) += module_64.o obj-$(CONFIG_MODULES) += $(module-y) diff --git a/arch/powerpc/kernel/setup_32.c b/arch/powerpc/kernel/setup_32.c index 79d434fc14d2..e5d285adb496 100644 --- a/arch/powerpc/kernel/setup_32.c +++ b/arch/powerpc/kernel/setup_32.c @@ -299,7 +299,7 @@ void __init setup_arch(char **cmdline_p) if (ppc_md.init_early) ppc_md.init_early(); -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_SERIAL_8250 find_legacy_serial_ports(); #endif finish_device_tree(); diff --git a/arch/powerpc/kernel/setup_64.c b/arch/powerpc/kernel/setup_64.c index 419e0b974b96..98e9f0595dd8 100644 --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -472,7 +472,7 @@ void __init setup_system(void) * hash table management for us, thus ioremap works. We do that early * so that further code can be debugged */ -#ifdef CONFIG_PPC_MULTIPLATFORM +#ifdef CONFIG_SERIAL_8250 find_legacy_serial_ports(); #endif |