summaryrefslogtreecommitdiffstats
path: root/drivers/net/dummy.c
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
committerRalf Baechle <ralf@linux-mips.org>1999-09-28 22:25:29 +0000
commit0ae8dceaebe3659ee0c3352c08125f403e77ebca (patch)
tree5085c389f09da78182b899d19fe1068b619a69dd /drivers/net/dummy.c
parent273767781288c35c9d679e908672b9996cda4c34 (diff)
Merge with 2.3.10.
Diffstat (limited to 'drivers/net/dummy.c')
-rw-r--r--drivers/net/dummy.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/dummy.c b/drivers/net/dummy.c
index 8d4ea3b05..c27d4628c 100644
--- a/drivers/net/dummy.c
+++ b/drivers/net/dummy.c
@@ -80,7 +80,7 @@ static int dummy_accept_fastpath(struct device *dev, struct dst_entry *dst)
}
#endif
-__initfunc(int dummy_init(struct device *dev))
+int __init dummy_init(struct device *dev)
{
/* Initialize the device structure. */
dev->hard_start_xmit = dummy_xmit;
@@ -127,7 +127,7 @@ static struct net_device_stats *dummy_get_stats(struct device *dev)
#ifdef MODULE
-__initfunc(static int dummy_probe(struct device *dev))
+static int __init dummy_probe(struct device *dev)
{
dummy_init(dev);
return 0;