diff options
author | Kumar Gala <galak@freescale.com> | 2005-06-21 20:15:20 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-21 21:46:23 -0400 |
commit | c93fcff6952068d484f2f7dae187037f46235647 (patch) | |
tree | 150cb47cc0d9b611cc15252860b1e1a2e4c512e6 | |
parent | c91999bba3ae8b21d4a965f19bf127bac3e5f7f2 (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>
-rw-r--r-- | arch/ppc/syslib/mpc85xx_devices.c | 2 |
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[] = { | |||
321 | }, | 321 | }, |
322 | }, | 322 | }, |
323 | }, | 323 | }, |
324 | #ifdef CONFIG_CPM2 | ||
325 | [MPC85xx_CPM_FCC1] = { | 324 | [MPC85xx_CPM_FCC1] = { |
326 | .name = "fsl-cpm-fcc", | 325 | .name = "fsl-cpm-fcc", |
327 | .id = 1, | 326 | .id = 1, |
@@ -575,7 +574,6 @@ struct platform_device ppc_sys_platform_devices[] = { | |||
575 | }, | 574 | }, |
576 | }, | 575 | }, |
577 | }, | 576 | }, |
578 | #endif /* CONFIG_CPM2 */ | ||
579 | [MPC85xx_eTSEC1] = { | 577 | [MPC85xx_eTSEC1] = { |
580 | .name = "fsl-gianfar", | 578 | .name = "fsl-gianfar", |
581 | .id = 1, | 579 | .id = 1, |