Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6

[sfrench/cifs-2.6.git] / arch / ppc / Kconfig.debug

diff --git a/arch/ppc/Kconfig.debug b/arch/ppc/Kconfig.debug
index e16c7710d4bef3442160e3d1886b7ac2690ba786..f94b87740973832adc8b9aee6c951ab46c36963c 100644 (file)
--- a/arch/ppc/Kconfig.debug
+++ b/arch/ppc/Kconfig.debug
@@ -53,20 +53,14 @@ config BDI_SWITCH
          Unless you are intending to debug the kernel with one of these
          machines, say N here.
 
-config BOOTX_TEXT
-       bool "Support for early boot text console (BootX or OpenFirmware only)"
-       depends PPC_OF
-       help
-         Say Y here to see progress messages from the boot firmware in text
-         mode. Requires either BootX or Open Firmware.
-
 config SERIAL_TEXT_DEBUG
        bool "Support for early boot texts over serial port"
-       depends on 4xx || GT64260 || LOPEC || PPLUS || PRPMC800 || PPC_GEN550 || PPC_MPC52xx
+       depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \
+               PPC_GEN550 || PPC_MPC52xx
 
 config PPC_OCP
        bool
-       depends on IBM_OCP || XILINX_OCP
+       depends on IBM_OCP
        default y
 
 endmenu