aboutsummaryrefslogtreecommitdiff
path: root/arch/powerpc/Kconfig.debug
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2008-04-18 13:34:30 +1000
committerPaul Mackerras <paulus@samba.org>2008-04-18 13:34:30 +1000
commit11a55f2274bf0d719e4dd05f4ac5e89a15740211 (patch)
tree0886a988b43e280fe00e529155f8cd796e7edcc8 /arch/powerpc/Kconfig.debug
parent858c52d15f186e055dc33a1872f5b45a66d42296 (diff)
parent1a9ebc0cd2b3bb4450834e564722630fbc40611b (diff)
Merge branch 'powerpc-next' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
Diffstat (limited to 'arch/powerpc/Kconfig.debug')
-rw-r--r--arch/powerpc/Kconfig.debug2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug
index db7cc34c24d..a86d8d85321 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -269,7 +269,7 @@ config PPC_EARLY_DEBUG_CPM_ADDR
hex "CPM UART early debug transmit descriptor address"
depends on PPC_EARLY_DEBUG_CPM
default "0xfa202008" if PPC_EP88XC
- default "0xf0000008" if CPM2
+ default "0xf0001ff8" if CPM2
default "0xff002008" if CPM1
help
This specifies the address of the transmit descriptor