]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[PATCH] ppc32: Removed dependency on CONFIG_CPM2 for building mpc85xx_device.c
authorKumar Gala <galak@freescale.com>
Wed, 22 Jun 2005 00:15:20 +0000 (17:15 -0700)
committerLinus Torvalds <torvalds@ppc970.osdl.org>
Wed, 22 Jun 2005 01:46:23 +0000 (18:46 -0700)
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>
arch/ppc/syslib/mpc85xx_devices.c

index b30c57d4518f1d9847b1cc34be569b98f7012b8d..8af322dd476a6467cda34d4983d1e589d46f21a4 100644 (file)
@@ -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,