1 From 2086d309f8b8de0b41119596d43f2a7bfe028a89 Mon Sep 17 00:00:00 2001
2 From: Grant Likely <grant.likely@secretlab.ca>
3 Date: Mon, 11 Dec 2006 22:46:59 -0700
4 Subject: [PATCH] [POWERPC] Change link order so mpc52xx-fec always shows up as eth0
6 Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
8 drivers/net/Makefile | 2 +-
9 drivers/net/fec_mpc52xx/fec.c | 2 ++
10 2 files changed, 3 insertions(+), 1 deletions(-)
12 diff --git a/drivers/net/Makefile b/drivers/net/Makefile
13 index e6f903d..95f0963 100644
14 --- a/drivers/net/Makefile
15 +++ b/drivers/net/Makefile
16 @@ -24,6 +24,7 @@ ucc_geth_driver-objs := ucc_geth.o ucc_geth_phy.o
17 obj-$(CONFIG_PLIP) += plip.o
19 obj-$(CONFIG_ROADRUNNER) += rrunner.o
20 +obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx/
22 obj-$(CONFIG_HAPPYMEAL) += sunhme.o
23 obj-$(CONFIG_SUNLANCE) += sunlance.o
24 @@ -196,7 +197,6 @@ obj-$(CONFIG_SMC91X) += smc91x.o
25 obj-$(CONFIG_SMC911X) += smc911x.o
26 obj-$(CONFIG_DM9000) += dm9000.o
27 obj-$(CONFIG_FEC_8XX) += fec_8xx/
28 -obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx/
30 obj-$(CONFIG_MACB) += macb.o
32 diff --git a/drivers/net/fec_mpc52xx/fec.c b/drivers/net/fec_mpc52xx/fec.c
33 index 894da79..30cef2b 100644
34 --- a/drivers/net/fec_mpc52xx/fec.c
35 +++ b/drivers/net/fec_mpc52xx/fec.c
36 @@ -731,6 +731,8 @@ mpc52xx_fec_probe(struct device *dev)
40 + printk(KERN_INFO "%s: mpc52xx-fec at %#lx,",
41 + ndev->name, (long)mem->start);
42 #if defined(CONFIG_PPC_MERGE)
43 dev_set_drvdata(&op->dev, ndev);