aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Li <Frank.Li@freescale.com>2013-03-24 11:03:42 -0400
committerDavid S. Miller <davem@davemloft.net>2013-03-25 12:14:57 -0400
commit793fc0964be1921f15a44be58b066f22b925d90b (patch)
treea1b481ea4852e0780f125ff6874d3ca58db09e00
parentda134825348faf797dc57c768bffc454ab7af34b (diff)
net: fec: build fec.c and fec_ptp.c to one module
fec_ptp.ko can't run individually rename fec.c to fec_main.c Build fec.o and fec_ptp.o into one fec.ko Remove unnessary EXPORT_SYMBOL in fec_ptp Signed-off-by: Frank Li <Frank.Li@freescale.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/freescale/Makefile3
-rw-r--r--drivers/net/ethernet/freescale/fec_main.c (renamed from drivers/net/ethernet/freescale/fec.c)0
-rw-r--r--drivers/net/ethernet/freescale/fec_ptp.c3
3 files changed, 2 insertions, 4 deletions
diff --git a/drivers/net/ethernet/freescale/Makefile b/drivers/net/ethernet/freescale/Makefile
index b7d58fe6f531..549ce13b92ac 100644
--- a/drivers/net/ethernet/freescale/Makefile
+++ b/drivers/net/ethernet/freescale/Makefile
@@ -2,7 +2,8 @@
2# Makefile for the Freescale network device drivers. 2# Makefile for the Freescale network device drivers.
3# 3#
4 4
5obj-$(CONFIG_FEC) += fec.o fec_ptp.o 5obj-$(CONFIG_FEC) += fec.o
6fec-objs :=fec_main.o fec_ptp.o
6obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o 7obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o
7ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y) 8ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)
8 obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o 9 obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o
diff --git a/drivers/net/ethernet/freescale/fec.c b/drivers/net/ethernet/freescale/fec_main.c
index 3eb608f5d0c7..3eb608f5d0c7 100644
--- a/drivers/net/ethernet/freescale/fec.c
+++ b/drivers/net/ethernet/freescale/fec_main.c
diff --git a/drivers/net/ethernet/freescale/fec_ptp.c b/drivers/net/ethernet/freescale/fec_ptp.c
index 0d8df400a479..1f17ca0f2201 100644
--- a/drivers/net/ethernet/freescale/fec_ptp.c
+++ b/drivers/net/ethernet/freescale/fec_ptp.c
@@ -128,7 +128,6 @@ void fec_ptp_start_cyclecounter(struct net_device *ndev)
128 128
129 spin_unlock_irqrestore(&fep->tmreg_lock, flags); 129 spin_unlock_irqrestore(&fep->tmreg_lock, flags);
130} 130}
131EXPORT_SYMBOL(fec_ptp_start_cyclecounter);
132 131
133/** 132/**
134 * fec_ptp_adjfreq - adjust ptp cycle frequency 133 * fec_ptp_adjfreq - adjust ptp cycle frequency
@@ -319,7 +318,6 @@ int fec_ptp_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd)
319 return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ? 318 return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
320 -EFAULT : 0; 319 -EFAULT : 0;
321} 320}
322EXPORT_SYMBOL(fec_ptp_ioctl);
323 321
324/** 322/**
325 * fec_time_keep - call timecounter_read every second to avoid timer overrun 323 * 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)
385 pr_info("registered PHC device on %s\n", ndev->name); 383 pr_info("registered PHC device on %s\n", ndev->name);
386 } 384 }
387} 385}
388EXPORT_SYMBOL(fec_ptp_init);