---

yaml --- r: 2478 b: refs/heads/master c: c93fcff h: refs/heads/master v: v3
git-mirror · Jun 22, 2005 · a478546 · a478546
1 parent 1655920
commit a478546
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c91999bba3ae8b21d4a965f19bf127bac3e5f7f2
+refs/heads/master: c93fcff6952068d484f2f7dae187037f46235647
diff --git a/trunk/arch/ppc/syslib/mpc85xx_devices.c b/trunk/arch/ppc/syslib/mpc85xx_devices.c
@@ -321,7 +321,6 @@ struct platform_device ppc_sys_platform_devices[] = {
 			},
 		},
 	},
-#ifdef CONFIG_CPM2
 	[MPC85xx_CPM_FCC1] = {
 		.name = "fsl-cpm-fcc",
 		.id	= 1,
@@ -575,7 +574,6 @@ struct platform_device ppc_sys_platform_devices[] = {
 			},
 		},
 	},
-#endif /* CONFIG_CPM2 */
 	[MPC85xx_eTSEC1] = {
 		.name = "fsl-gianfar",
 		.id	= 1,