Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c93fcff6 authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds
Browse files

[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: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent c91999bb

arch/ppc/syslib/mpc85xx_devices.c

+0 −2
Original line number Diff line number Diff line
@@ -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,