From: Kumar Gala <galak@freescale.com>

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>
---

 arch/ppc/syslib/mpc85xx_devices.c |    2 --
 1 files changed, 2 deletions(-)

diff -puN arch/ppc/syslib/mpc85xx_devices.c~ppc32-removed-dependency-on-config_cpm2-for-building arch/ppc/syslib/mpc85xx_devices.c
--- 25/arch/ppc/syslib/mpc85xx_devices.c~ppc32-removed-dependency-on-config_cpm2-for-building	2005-06-01 13:04:28.000000000 -0700
+++ 25-akpm/arch/ppc/syslib/mpc85xx_devices.c	2005-06-01 13:04:28.000000000 -0700
@@ -321,7 +321,6 @@ struct platform_device ppc_sys_platform_
 			},
 		},
 	},
-#ifdef CONFIG_CPM2
 	[MPC85xx_CPM_FCC1] = {
 		.name = "fsl-cpm-fcc",
 		.id	= 1,
@@ -575,7 +574,6 @@ struct platform_device ppc_sys_platform_
 			},
 		},
 	},
-#endif /* CONFIG_CPM2 */
 	[MPC85xx_eTSEC1] = {
 		.name = "fsl-gianfar",
 		.id	= 1,
_