diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 11:57:35 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-23 11:57:35 -0400 |
commit | e5eca6aef6a2a57e433db1eac247d2d1c213ce08 (patch) | |
tree | 8f59e569c546f6f5d1ca7635e11cacb4005eaf6f /arch/powerpc/Kconfig.debug | |
parent | 6e506079c80c96dc9f813491231433762fbad91d (diff) | |
parent | 786d3693f46579c7cd982e65de9f43eba94e4a57 (diff) |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
[POWERPC] Add Vitaly Bordug as PPC8xx maintainer
[POWERPC] 4xx: Enable EMAC on Bamboo board
[POWERPC] 4xx: Enable EMAC for PPC405 Walnut board
[POWERPC] 4xx: Fix timebase clock selection on Walnut
[POWERPC] 4xx: Enable EMAC on the PPC 440GP Ebony board
[POWERPC] 4xx: Split early debug output and early boot console for 44x
[POWERPC] 4xx: Enable NEW EMAC support for Sequoia 440EPx.
[POWERPC] 4xx: Add RGMII support for Sequoia 440EPx
Diffstat (limited to 'arch/powerpc/Kconfig.debug')
-rw-r--r-- | arch/powerpc/Kconfig.debug | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/Kconfig.debug b/arch/powerpc/Kconfig.debug index c939fe86a9e0..6a79fe43e229 100644 --- a/arch/powerpc/Kconfig.debug +++ b/arch/powerpc/Kconfig.debug | |||
@@ -216,7 +216,6 @@ config PPC_EARLY_DEBUG_BEAT | |||
216 | config PPC_EARLY_DEBUG_44x | 216 | config PPC_EARLY_DEBUG_44x |
217 | bool "Early serial debugging for IBM/AMCC 44x CPUs" | 217 | bool "Early serial debugging for IBM/AMCC 44x CPUs" |
218 | depends on 44x | 218 | depends on 44x |
219 | select PPC_UDBG_16550 | ||
220 | help | 219 | help |
221 | Select this to enable early debugging for IBM 44x chips via the | 220 | Select this to enable early debugging for IBM 44x chips via the |
222 | inbuilt serial port. | 221 | inbuilt serial port. |