diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-04-17 23:34:30 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-04-17 23:34:30 -0400 |
| commit | 11a55f2274bf0d719e4dd05f4ac5e89a15740211 (patch) | |
| tree | 0886a988b43e280fe00e529155f8cd796e7edcc8 /arch/powerpc/Kconfig.debug | |
| parent | 858c52d15f186e055dc33a1872f5b45a66d42296 (diff) | |
| parent | 1a9ebc0cd2b3bb4450834e564722630fbc40611b (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.debug | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index db7cc34c24d4..a86d8d853214 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
| @@ -269,7 +269,7 @@ config PPC_EARLY_DEBUG_CPM_ADDR | |||
| 269 | hex "CPM UART early debug transmit descriptor address" | 269 | hex "CPM UART early debug transmit descriptor address" |
| 270 | depends on PPC_EARLY_DEBUG_CPM | 270 | depends on PPC_EARLY_DEBUG_CPM |
| 271 | default "0xfa202008" if PPC_EP88XC | 271 | default "0xfa202008" if PPC_EP88XC |
| 272 | default "0xf0000008" if CPM2 | 272 | default "0xf0001ff8" if CPM2 |
| 273 | default "0xff002008" if CPM1 | 273 | default "0xff002008" if CPM1 |
| 274 | help | 274 | help |
| 275 | This specifies the address of the transmit descriptor | 275 | This specifies the address of the transmit descriptor |