From 72fe4b0e06ecdcd58317cb0e17548b9c9bee2859 Mon Sep 17 00:00:00 2001
From: Kumar Gala <galak@kernel.crashing.org>
Date: Mon, 27 Mar 2006 23:48:37 -0600
Subject: [PATCH] --- yaml --- r: 24653 b: refs/heads/master c:
 78af90629ce98c8383ea16928e110eb97b889be6 h: refs/heads/master i:   24651:
 fc237ed46262440b9c165d9baeb168903a5da8a1 v: v3

---
 [refs]                               | 2 +-
 trunk/arch/powerpc/Kconfig.debug     | 5 -----
 trunk/arch/powerpc/kernel/setup_32.c | 6 ------
 3 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 8904f019ecfa..8d551e1fea88 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9cf8ca38719e08e5388ddd37ef1c46442b8f99a4
+refs/heads/master: 78af90629ce98c8383ea16928e110eb97b889be6
diff --git a/trunk/arch/powerpc/Kconfig.debug b/trunk/arch/powerpc/Kconfig.debug
index 9254806f7032..8d48e9e7162a 100644
--- a/trunk/arch/powerpc/Kconfig.debug
+++ b/trunk/arch/powerpc/Kconfig.debug
@@ -110,11 +110,6 @@ config SERIAL_TEXT_DEBUG
 	depends on 4xx || LOPEC || MV64X60 || PPLUS || PRPMC800 || \
 		PPC_GEN550 || PPC_MPC52xx
 
-config PPC_OCP
-	bool
-	depends on IBM_OCP || XILINX_OCP
-	default y
-
 choice
 	prompt "Early debugging (dangerous)"
 	bool
diff --git a/trunk/arch/powerpc/kernel/setup_32.c b/trunk/arch/powerpc/kernel/setup_32.c
index e39f830317a8..a2c89435abec 100644
--- a/trunk/arch/powerpc/kernel/setup_32.c
+++ b/trunk/arch/powerpc/kernel/setup_32.c
@@ -351,12 +351,6 @@ void __init setup_arch(char **cmdline_p)
 	do_init_bootmem();
 	if ( ppc_md.progress ) ppc_md.progress("setup_arch: bootmem", 0x3eab);
 
-#ifdef CONFIG_PPC_OCP
-	/* Initialize OCP device list */
-	ocp_early_init();
-	if ( ppc_md.progress ) ppc_md.progress("ocp: exit", 0x3eab);
-#endif
-
 #ifdef CONFIG_DUMMY_CONSOLE
 	conswitchp = &dummy_con;
 #endif