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
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
drivers
/
net
/
sb1250-mac.c
diff --git
a/drivers/net/sb1250-mac.c
b/drivers/net/sb1250-mac.c
index
f2be9f8
..
9ab1618
100644
(file)
--- a/
drivers/net/sb1250-mac.c
+++ b/
drivers/net/sb1250-mac.c
@@
-31,7
+31,6
@@
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/init.h>
#include <linux/etherdevice.h>
#include <linux/skbuff.h>
#include <linux/init.h>
-#include <linux/config.h>
#include <linux/bitops.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
#include <linux/bitops.h>
#include <asm/processor.h> /* Processor type for cache alignment. */
#include <asm/io.h>
@@
-2451,7
+2450,7
@@
static int sbmac_open(struct net_device *dev)
*/
__raw_readq(sc->sbm_isr);
*/
__raw_readq(sc->sbm_isr);
- if (request_irq(dev->irq, &sbmac_intr,
SA_SHIRQ
, dev->name, dev))
+ if (request_irq(dev->irq, &sbmac_intr,
IRQF_SHARED
, dev->name, dev))
return -EBUSY;
/*
return -EBUSY;
/*