summaryrefslogtreecommitdiff
path: root/arch/ppc/platforms/85xx/sbc8560.c
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-05-31 11:50:32 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-31 11:50:32 -0400
commitedb3e182b6f33c91ba8778e2198220c12712d3ad (patch)
tree6b741e144c2c83e901a325e5373dc0b8baf88534 /arch/ppc/platforms/85xx/sbc8560.c
parent8973a585aec125beb2a3de50bb491004299f53d5 (diff)
parent5e485b7975472ba4a408523deb6541e70c451842 (diff)
downloadlwn-edb3e182b6f33c91ba8778e2198220c12712d3ad.tar.gz
lwn-edb3e182b6f33c91ba8778e2198220c12712d3ad.zip
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
Diffstat (limited to 'arch/ppc/platforms/85xx/sbc8560.c')
-rw-r--r--arch/ppc/platforms/85xx/sbc8560.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/ppc/platforms/85xx/sbc8560.c b/arch/ppc/platforms/85xx/sbc8560.c
index 9ab05e590c3e..7b9e1543e175 100644
--- a/arch/ppc/platforms/85xx/sbc8560.c
+++ b/arch/ppc/platforms/85xx/sbc8560.c
@@ -221,6 +221,9 @@ platform_init(unsigned long r3, unsigned long r4, unsigned long r5,
#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_SERIAL_TEXT_DEBUG)
ppc_md.progress = gen550_progress;
#endif /* CONFIG_SERIAL_8250 && CONFIG_SERIAL_TEXT_DEBUG */
+#if defined(CONFIG_SERIAL_8250) && defined(CONFIG_KGDB)
+ ppc_md.early_serial_map = sbc8560_early_serial_map;
+#endif /* CONFIG_SERIAL_8250 && CONFIG_KGDB */
if (ppc_md.progress)
ppc_md.progress("sbc8560_init(): exit", 0);