diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-07-03 13:49:45 -0400 |
| commit | 026477c1141b67e98e3bd8bdedb7d4b88a3ecd09 (patch) | |
| tree | 2624a44924c625c367f3cebf937853b9da2de282 /drivers/isdn/hisax/gazel.c | |
| parent | 9f2fa466383ce100b90fe52cb4489d7a26bf72a9 (diff) | |
| parent | 29454dde27d8e340bb1987bad9aa504af7081eba (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Diffstat (limited to 'drivers/isdn/hisax/gazel.c')
| -rw-r--r-- | drivers/isdn/hisax/gazel.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/isdn/hisax/gazel.c b/drivers/isdn/hisax/gazel.c index 60b04c6d9e7d..3e7d92303582 100644 --- a/drivers/isdn/hisax/gazel.c +++ b/drivers/isdn/hisax/gazel.c | |||
| @@ -11,7 +11,6 @@ | |||
| 11 | * | 11 | * |
| 12 | */ | 12 | */ |
| 13 | 13 | ||
| 14 | #include <linux/config.h> | ||
| 15 | #include <linux/init.h> | 14 | #include <linux/init.h> |
| 16 | #include "hisax.h" | 15 | #include "hisax.h" |
| 17 | #include "isac.h" | 16 | #include "isac.h" |
| @@ -593,7 +592,7 @@ setup_gazelpci(struct IsdnCardState *cs) | |||
| 593 | cs->hw.gazel.hscxfifo[0] = cs->hw.gazel.hscx[0]; | 592 | cs->hw.gazel.hscxfifo[0] = cs->hw.gazel.hscx[0]; |
| 594 | cs->hw.gazel.hscxfifo[1] = cs->hw.gazel.hscx[1]; | 593 | cs->hw.gazel.hscxfifo[1] = cs->hw.gazel.hscx[1]; |
| 595 | cs->irq = pci_irq; | 594 | cs->irq = pci_irq; |
| 596 | cs->irq_flags |= SA_SHIRQ; | 595 | cs->irq_flags |= IRQF_SHARED; |
| 597 | 596 | ||
| 598 | switch (seekcard) { | 597 | switch (seekcard) { |
| 599 | case PCI_DEVICE_ID_PLX_R685: | 598 | case PCI_DEVICE_ID_PLX_R685: |