---

yaml --- r: 6897 b: refs/heads/master c: 89d7f53 h: refs/heads/master i: 6895: 6412661 v: v3
git-mirror · Sep 5, 2005 · df5a34f · df5a34f
1 parent 76fc46e
commit df5a34f
Show file tree

Hide file tree

Showing 9 changed files with 3 additions and 1,239 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba9d1e2a3da505f0574751c3041bbc307c30aeca
+refs/heads/master: 89d7f53030baa2616eb2fe87cbc19bc73111a78e
diff --git a/trunk/arch/ppc/Kconfig b/trunk/arch/ppc/Kconfig
@@ -613,9 +613,6 @@ config EV64260
 config LOPEC
 	bool "Motorola-LoPEC"
 
-config MCPN765
-	bool "Motorola-MCPN765"
-
 config MVME5100
 	bool "Motorola-MVME5100"
 
@@ -790,7 +787,7 @@ config PPC_OF
 
 config PPC_GEN550
 	bool
-	depends on SANDPOINT || MCPN765 || SPRUCE || PPLUS || PCORE || \
+	depends on SANDPOINT || SPRUCE || PPLUS || PCORE || \
 		PRPMC750 || PRPMC800 || LOPEC || \
 		(EV64260 && !SERIAL_MPSC) || CHESTNUT || RADSTONE_PPC7D || \
 		83xx

diff --git a/trunk/arch/ppc/boot/simple/Makefile b/trunk/arch/ppc/boot/simple/Makefile
@@ -106,7 +106,7 @@ zimageinitrd-$(CONFIG_GEMINI)		:= zImage.initrd-STRIPELF
 
 # kconfig 'feature', only one of these will ever be 'y' at a time.
 # The rest will be unset.
-motorola := $(CONFIG_MCPN765)$(CONFIG_MVME5100)$(CONFIG_PRPMC750) \
+motorola := $(CONFIG_MVME5100)$(CONFIG_PRPMC750) \
 $(CONFIG_PRPMC800)$(CONFIG_LOPEC)$(CONFIG_PPLUS)
 motorola := $(strip $(motorola))
 pcore := $(CONFIG_PCORE)$(CONFIG_POWERPMC250)