projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/vitb/linux...
[cascardo/linux.git]
/
drivers
/
net
/
tokenring
/
smctr.c
diff --git
a/drivers/net/tokenring/smctr.c
b/drivers/net/tokenring/smctr.c
index
cd2e025
..
85a7f79
100644
(file)
--- a/
drivers/net/tokenring/smctr.c
+++ b/
drivers/net/tokenring/smctr.c
@@
-5666,7
+5666,7
@@
module_param_array(io, int, NULL, 0);
module_param_array(irq, int, NULL, 0);
module_param(ringspeed, int, 0);
module_param_array(irq, int, NULL, 0);
module_param(ringspeed, int, 0);
-static struct net_device *setup_card(int n)
+static struct net_device *
__init
setup_card(int n)
{
struct net_device *dev = alloc_trdev(sizeof(struct net_local));
int err;
{
struct net_device *dev = alloc_trdev(sizeof(struct net_local));
int err;
@@
-5696,9
+5696,8
@@
out:
free_netdev(dev);
return ERR_PTR(err);
}
free_netdev(dev);
return ERR_PTR(err);
}
-
-int init_module(void)
+int
__init
init_module(void)
{
int i, found = 0;
struct net_device *dev;
{
int i, found = 0;
struct net_device *dev;