summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2006-11-30 11:45:14 +1100
committerPaul Mackerras <paulus@samba.org>2006-12-04 20:41:58 +1100
commit80814be40e1f0e7e6fc00fdfe0af16268670e0b4 (patch)
tree791472128eb2236b86e9c7a9d655f27ffa1e0348 /arch
parentbbb681779012fae778c0a53081bbb19cf43bca4e (diff)
downloadlinux-80814be40e1f0e7e6fc00fdfe0af16268670e0b4.tar.gz
linux-80814be40e1f0e7e6fc00fdfe0af16268670e0b4.tar.bz2
linux-80814be40e1f0e7e6fc00fdfe0af16268670e0b4.zip
[POWERPC] Allow CONFIG_BOOTX_TEXT on iSeries
and therefore combined builds. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-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 5cce9048ce01..f0e51edde022 100644
--- a/arch/powerpc/Kconfig.debug
+++ b/arch/powerpc/Kconfig.debug
@@ -125,7 +125,7 @@ config BDI_SWITCH
config BOOTX_TEXT
bool "Support for early boot text console (BootX or OpenFirmware only)"
- depends PPC_OF && !PPC_ISERIES
+ depends PPC_OF
help
Say Y here to see progress messages from the boot firmware in text
mode. Requires either BootX or Open Firmware.