From: Kumar Gala <galak@freescale.com>
Date: Wed, 22 Jun 2005 00:15:20 +0000 (-0700)
Subject: [PATCH] ppc32: Removed dependency on CONFIG_CPM2 for building mpc85xx_device.c
X-Git-Tag: v2.6.13-rc4~130^2~202^2~122
X-Git-Url: http://pileus.org/git/?a=commitdiff_plain;h=c93fcff6952068d484f2f7dae187037f46235647;p=~andy%2Flinux

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

diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c
index b30c57d4518..8af322dd476 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,