From a317606a5f9c12a2f465935f43e7abcc4d0578fc Mon Sep 17 00:00:00 2001 From: Frank Li Date: Sun, 24 Mar 2013 15:03:42 +0000 Subject: [PATCH] --- yaml --- r: 368653 b: refs/heads/master c: 793fc0964be1921f15a44be58b066f22b925d90b h: refs/heads/master i: 368651: 540f4b3eee91d1186553c289452d92414f6f1902 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/freescale/Makefile | 3 ++- trunk/drivers/net/ethernet/freescale/{fec.c => fec_main.c} | 0 trunk/drivers/net/ethernet/freescale/fec_ptp.c | 3 --- 4 files changed, 3 insertions(+), 5 deletions(-) rename trunk/drivers/net/ethernet/freescale/{fec.c => fec_main.c} (100%) diff --git a/[refs] b/[refs] index 91f6098a85c4..a0b19456b7f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da134825348faf797dc57c768bffc454ab7af34b +refs/heads/master: 793fc0964be1921f15a44be58b066f22b925d90b diff --git a/trunk/drivers/net/ethernet/freescale/Makefile b/trunk/drivers/net/ethernet/freescale/Makefile index b7d58fe6f531..549ce13b92ac 100644 --- a/trunk/drivers/net/ethernet/freescale/Makefile +++ b/trunk/drivers/net/ethernet/freescale/Makefile @@ -2,7 +2,8 @@ # Makefile for the Freescale network device drivers. # -obj-$(CONFIG_FEC) += fec.o fec_ptp.o +obj-$(CONFIG_FEC) += fec.o +fec-objs :=fec_main.o fec_ptp.o obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y) obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o diff --git a/trunk/drivers/net/ethernet/freescale/fec.c b/trunk/drivers/net/ethernet/freescale/fec_main.c similarity index 100% rename from trunk/drivers/net/ethernet/freescale/fec.c rename to trunk/drivers/net/ethernet/freescale/fec_main.c diff --git a/trunk/drivers/net/ethernet/freescale/fec_ptp.c b/trunk/drivers/net/ethernet/freescale/fec_ptp.c index 0d8df400a479..1f17ca0f2201 100644 --- a/trunk/drivers/net/ethernet/freescale/fec_ptp.c +++ b/trunk/drivers/net/ethernet/freescale/fec_ptp.c @@ -128,7 +128,6 @@ void fec_ptp_start_cyclecounter(struct net_device *ndev) spin_unlock_irqrestore(&fep->tmreg_lock, flags); } -EXPORT_SYMBOL(fec_ptp_start_cyclecounter); /** * fec_ptp_adjfreq - adjust ptp cycle frequency @@ -319,7 +318,6 @@ int fec_ptp_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd) return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ? -EFAULT : 0; } -EXPORT_SYMBOL(fec_ptp_ioctl); /** * fec_time_keep - call timecounter_read every second to avoid timer overrun @@ -385,4 +383,3 @@ void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev) pr_info("registered PHC device on %s\n", ndev->name); } } -EXPORT_SYMBOL(fec_ptp_init);