summaryrefslogtreecommitdiff
path: root/arch/ppc
diff options
context:
space:
mode:
authorKumar Gala <galak@freescale.com>2005-06-21 17:15:20 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-21 18:46:23 -0700
commitc93fcff6952068d484f2f7dae187037f46235647 (patch)
tree150cb47cc0d9b611cc15252860b1e1a2e4c512e6 /arch/ppc
parentc91999bba3ae8b21d4a965f19bf127bac3e5f7f2 (diff)
[PATCH] ppc32: Removed dependency on CONFIG_CPM2 for building mpc85xx_device.c
Previously we needed CONFIG_CPM2 enabled to get the proper IRQ ifdef's for CPM interrupts. Recent changes have caused that to be no longer necessary. Signed-off-by: Kumar Gala <kumar.gala@freescale.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/ppc')
-rw-r--r--arch/ppc/syslib/mpc85xx_devices.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c
index b30c57d4518f..8af322dd476a 100644
--- a/arch/ppc/syslib/mpc85xx_devices.c
+++ b/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,