projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'genirq' of master.kernel.org:/home/rmk/linux-2.6-arm
[powerpc.git]
/
drivers
/
isdn
/
hisax
/
gazel.c
diff --git
a/drivers/isdn/hisax/gazel.c
b/drivers/isdn/hisax/gazel.c
index
60b04c6
..
3e7d923
100644
(file)
--- a/
drivers/isdn/hisax/gazel.c
+++ b/
drivers/isdn/hisax/gazel.c
@@
-11,7
+11,6
@@
*
*/
*
*/
-#include <linux/config.h>
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
#include <linux/init.h>
#include "hisax.h"
#include "isac.h"
@@
-593,7
+592,7
@@
setup_gazelpci(struct IsdnCardState *cs)
cs->hw.gazel.hscxfifo[0] = cs->hw.gazel.hscx[0];
cs->hw.gazel.hscxfifo[1] = cs->hw.gazel.hscx[1];
cs->irq = pci_irq;
cs->hw.gazel.hscxfifo[0] = cs->hw.gazel.hscx[0];
cs->hw.gazel.hscxfifo[1] = cs->hw.gazel.hscx[1];
cs->irq = pci_irq;
- cs->irq_flags |=
SA_SHIRQ
;
+ cs->irq_flags |=
IRQF_SHARED
;
switch (seekcard) {
case PCI_DEVICE_ID_PLX_R685:
switch (seekcard) {
case PCI_DEVICE_ID_PLX_R685: