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

Commit 793fc096 authored by Frank Li's avatar Frank Li Committed by David S. Miller
Browse files

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: default avatarFrank Li <Frank.Li@freescale.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent da134825

drivers/net/ethernet/freescale/Makefile

+2 −1
Original line number Original line Diff line number Diff line
@@ -2,7 +2,8 @@ 
# Makefile for the Freescale network device drivers.

# 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

obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx.o

ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)

ifeq ($(CONFIG_FEC_MPC52xx_MDIO),y)

	obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o

	obj-$(CONFIG_FEC_MPC52xx) += fec_mpc52xx_phy.o

drivers/net/ethernet/freescale/fec_ptp.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -128,7 +128,6 @@ void fec_ptp_start_cyclecounter(struct net_device *ndev) 




	spin_unlock_irqrestore(&fep->tmreg_lock, flags);

	spin_unlock_irqrestore(&fep->tmreg_lock, flags);

}

}

EXPORT_SYMBOL(fec_ptp_start_cyclecounter);





/**

/**

 * fec_ptp_adjfreq - adjust ptp cycle frequency

 * 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)) ?

	return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?

	    -EFAULT : 0;

	    -EFAULT : 0;

}

}

EXPORT_SYMBOL(fec_ptp_ioctl);





/**

/**

 * fec_time_keep - call timecounter_read every second to avoid timer overrun

 * 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);

		pr_info("registered PHC device on %s\n", ndev->name);

	}

	}

}
 
}
 
EXPORT_SYMBOL(fec_ptp_init);