Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 368653
b: refs/heads/master
c: 793fc09
h: refs/heads/master
i:
  368651: 540f4b3
v: v3
  • Loading branch information
Frank Li authored and David S. Miller committed Mar 25, 2013
1 parent 7aa2f56 commit a317606
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: da134825348faf797dc57c768bffc454ab7af34b
refs/heads/master: 793fc0964be1921f15a44be58b066f22b925d90b
3 changes: 2 additions & 1 deletion trunk/drivers/net/ethernet/freescale/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
3 changes: 0 additions & 3 deletions trunk/drivers/net/ethernet/freescale/fec_ptp.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);

0 comments on commit a317606

Please sign in to comment.