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
/
amd8111e.c
diff --git
a/drivers/net/amd8111e.c
b/drivers/net/amd8111e.c
index
d9ba8be
..
ed322a7
100755
(executable)
--- a/
drivers/net/amd8111e.c
+++ b/
drivers/net/amd8111e.c
@@
-69,7
+69,6
@@
Revision History:
*/
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
#include <linux/module.h>
#include <linux/kernel.h>
#include <linux/types.h>
@@
-1377,7
+1376,7
@@
static int amd8111e_open(struct net_device * dev )
{
struct amd8111e_priv *lp = netdev_priv(dev);
{
struct amd8111e_priv *lp = netdev_priv(dev);
- if(dev->irq ==0 || request_irq(dev->irq, amd8111e_interrupt,
SA_SHIRQ
,
+ if(dev->irq ==0 || request_irq(dev->irq, amd8111e_interrupt,
IRQF_SHARED
,
dev->name, dev))
return -EAGAIN;
dev->name, dev))
return -EAGAIN;