git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
net
/
tokenring
/
smctr.c
diff --git
a/drivers/net/tokenring/smctr.c
b/drivers/net/tokenring/smctr.c
index
85a7f79
..
67d2b59
100644
(file)
--- a/
drivers/net/tokenring/smctr.c
+++ b/
drivers/net/tokenring/smctr.c
@@
-29,6
+29,7
@@
*/
#include <linux/module.h>
*/
#include <linux/module.h>
+#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/fcntl.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/fcntl.h>
@@
-531,7
+532,7
@@
static int __init smctr_chk_mca(struct net_device *dev)
dev->irq = 15;
break;
}
dev->irq = 15;
break;
}
- if (request_irq(dev->irq, smctr_interrupt,
IRQF_SHARED
, smctr_name, dev)) {
+ if (request_irq(dev->irq, smctr_interrupt,
SA_SHIRQ
, smctr_name, dev)) {
release_region(dev->base_addr, SMCTR_IO_EXTENT);
return -ENODEV;
}
release_region(dev->base_addr, SMCTR_IO_EXTENT);
return -ENODEV;
}
@@
-1061,7
+1062,7
@@
static int __init smctr_chk_isa(struct net_device *dev)
goto out2;
}
goto out2;
}
- if (request_irq(dev->irq, smctr_interrupt,
IRQF_SHARED
, smctr_name, dev))
+ if (request_irq(dev->irq, smctr_interrupt,
SA_SHIRQ
, smctr_name, dev))
goto out2;
/* Get 58x Rom Base */
goto out2;
/* Get 58x Rom Base */
@@
-5666,7
+5667,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 *
__init
setup_card(int n)
+static struct net_device *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,8
+5697,9
@@
out:
free_netdev(dev);
return ERR_PTR(err);
}
free_netdev(dev);
return ERR_PTR(err);
}
+
-int
__init
init_module(void)
+int init_module(void)
{
int i, found = 0;
struct net_device *dev;
{
int i, found = 0;
struct net_device *dev;