summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-07-17 19:24:56 +0200
committerIngo Molnar <mingo@elte.hu>2008-07-17 19:24:56 +0200
commitc43c1be0f7e0ac3d2fe1d4a5b37041c4c4463af1 (patch)
tree618b5e8ac458258acc981e0aeeac6f232f14aaf8 /arch
parente22146e610bb7aed63282148740ab1d1b91e1d90 (diff)
parenta3cf859321486f69506326146ab3e2fd15c05c3f (diff)
downloadop-kernel-dev-c43c1be0f7e0ac3d2fe1d4a5b37041c4c4463af1.zip
op-kernel-dev-c43c1be0f7e0ac3d2fe1d4a5b37041c4c4463af1.tar.gz
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/platforms/82xx/ep8248e.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/powerpc/platforms/82xx/ep8248e.c b/arch/powerpc/platforms/82xx/ep8248e.c
index d5770fd..373e993 100644
--- a/arch/powerpc/platforms/82xx/ep8248e.c
+++ b/arch/powerpc/platforms/82xx/ep8248e.c
@@ -59,6 +59,7 @@ static void __init ep8248e_pic_init(void)
of_node_put(np);
}
+#ifdef CONFIG_FS_ENET_MDIO_FCC
static void ep8248e_set_mdc(struct mdiobb_ctrl *ctrl, int level)
{
if (level)
@@ -164,6 +165,7 @@ static struct of_platform_driver ep8248e_mdio_driver = {
.probe = ep8248e_mdio_probe,
.remove = ep8248e_mdio_remove,
};
+#endif
struct cpm_pin {
int port, pin, flags;
@@ -296,7 +298,9 @@ static __initdata struct of_device_id of_bus_ids[] = {
static int __init declare_of_platform_devices(void)
{
of_platform_bus_probe(NULL, of_bus_ids, NULL);
+#ifdef CONFIG_FS_ENET_MDIO_FCC
of_register_platform_driver(&ep8248e_mdio_driver);
+#endif
return 0;
}
OpenPOWER on IntegriCloud