diff options
author | James Morris <jmorris@macbook.(none)> | 2009-12-03 07:33:40 +0100 |
---|---|---|
committer | James Morris <jmorris@macbook.(none)> | 2009-12-03 07:33:40 +0100 |
commit | c84d6efd363a3948eb32ec40d46bab6338580454 (patch) | |
tree | 3ba7ac46e6626fe8ac843834588609eb6ccee5c6 /drivers/net/fec.c | |
parent | TOMOYO: Add recursive directory matching operator support. (diff) | |
parent | Linux 2.6.32 (diff) | |
download | linux-c84d6efd363a3948eb32ec40d46bab6338580454.tar.xz linux-c84d6efd363a3948eb32ec40d46bab6338580454.zip |
Merge branch 'master' into next
Diffstat (limited to 'drivers/net/fec.c')
-rw-r--r-- | drivers/net/fec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index 29234380e6c6..16a1d58419d9 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -1654,7 +1654,7 @@ static const struct net_device_ops fec_netdev_ops = { * * index is only used in legacy code */ -int __init fec_enet_init(struct net_device *dev, int index) +static int fec_enet_init(struct net_device *dev, int index) { struct fec_enet_private *fep = netdev_priv(dev); struct bufdesc *cbd_base; |