---

yaml --- r: 3219 b: refs/heads/master c: 3d9077a h: refs/heads/master i: 3217: 080c117 3215: 53592b5 v: v3
git-mirror · Jun 25, 2005 · dd25ae8 · dd25ae8
1 parent e535702
commit dd25ae8
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 60 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 33d9e9b56d5ccd7776fdfe3ecce4a2793dee6fd3
+refs/heads/master: 3d9077afea4927e488282da7189de9159db20c17
diff --git a/trunk/arch/ppc/Kconfig.debug b/trunk/arch/ppc/Kconfig.debug
@@ -66,7 +66,7 @@ config SERIAL_TEXT_DEBUG
 
 config PPC_OCP
 	bool
-	depends on IBM_OCP || FSL_OCP || XILINX_OCP
+	depends on IBM_OCP || XILINX_OCP
 	default y
 
 endmenu
diff --git a/trunk/include/asm-ppc/fsl_ocp.h b/trunk/include/asm-ppc/fsl_ocp.h
diff --git a/trunk/include/asm-ppc/ocp.h b/trunk/include/asm-ppc/ocp.h
@@ -202,10 +202,6 @@ static DEVICE_ATTR(name##_##field, S_IRUGO, show_##name##_##field, NULL);
 #include <asm/ibm_ocp.h>
 #endif
 
-#ifdef CONFIG_FSL_OCP
-#include <asm/fsl_ocp.h>
-#endif
-
 #endif				/* CONFIG_PPC_OCP */
 #endif				/* __OCP_H__ */
 #endif				/* __KERNEL__ */