projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch '83xx' into for_paulus
[powerpc.git]
/
drivers
/
atm
/
eni.c
diff --git
a/drivers/atm/eni.c
b/drivers/atm/eni.c
index
c13c4d7
..
df359a6
100644
(file)
--- a/
drivers/atm/eni.c
+++ b/
drivers/atm/eni.c
@@
-4,7
+4,6
@@
#include <linux/module.h>
#include <linux/module.h>
-#include <linux/config.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/pci.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/pci.h>
@@
-1798,7
+1797,7
@@
static int __devinit eni_start(struct atm_dev *dev)
DPRINTK(">eni_start\n");
eni_dev = ENI_DEV(dev);
DPRINTK(">eni_start\n");
eni_dev = ENI_DEV(dev);
- if (request_irq(eni_dev->irq,&eni_int,
SA_SHIRQ
,DEV_LABEL,dev)) {
+ if (request_irq(eni_dev->irq,&eni_int,
IRQF_SHARED
,DEV_LABEL,dev)) {
printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
dev->number,eni_dev->irq);
error = -EAGAIN;
printk(KERN_ERR DEV_LABEL "(itf %d): IRQ%d is already in use\n",
dev->number,eni_dev->irq);
error = -EAGAIN;