diff options
Diffstat (limited to 'drivers/char/cyclades.c')
-rw-r--r-- | drivers/char/cyclades.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/char/cyclades.c b/drivers/char/cyclades.c index 2657eeba7da6..c1c67281750d 100644 --- a/drivers/char/cyclades.c +++ b/drivers/char/cyclades.c | |||
@@ -633,7 +633,6 @@ static char rcsid[] = | |||
633 | /* | 633 | /* |
634 | * Include section | 634 | * Include section |
635 | */ | 635 | */ |
636 | #include <linux/config.h> | ||
637 | #include <linux/module.h> | 636 | #include <linux/module.h> |
638 | #include <linux/errno.h> | 637 | #include <linux/errno.h> |
639 | #include <linux/signal.h> | 638 | #include <linux/signal.h> |
@@ -4613,7 +4612,7 @@ cy_detect_isa(void) | |||
4613 | 4612 | ||
4614 | /* allocate IRQ */ | 4613 | /* allocate IRQ */ |
4615 | if(request_irq(cy_isa_irq, cyy_interrupt, | 4614 | if(request_irq(cy_isa_irq, cyy_interrupt, |
4616 | SA_INTERRUPT, "Cyclom-Y", &cy_card[j])) | 4615 | IRQF_DISABLED, "Cyclom-Y", &cy_card[j])) |
4617 | { | 4616 | { |
4618 | printk("Cyclom-Y/ISA found at 0x%lx ", | 4617 | printk("Cyclom-Y/ISA found at 0x%lx ", |
4619 | (unsigned long) cy_isa_address); | 4618 | (unsigned long) cy_isa_address); |
@@ -4786,7 +4785,7 @@ cy_detect_pci(void) | |||
4786 | 4785 | ||
4787 | /* allocate IRQ */ | 4786 | /* allocate IRQ */ |
4788 | if(request_irq(cy_pci_irq, cyy_interrupt, | 4787 | if(request_irq(cy_pci_irq, cyy_interrupt, |
4789 | SA_SHIRQ, "Cyclom-Y", &cy_card[j])) | 4788 | IRQF_SHARED, "Cyclom-Y", &cy_card[j])) |
4790 | { | 4789 | { |
4791 | printk("Cyclom-Y/PCI found at 0x%lx ", | 4790 | printk("Cyclom-Y/PCI found at 0x%lx ", |
4792 | (ulong) cy_pci_phys2); | 4791 | (ulong) cy_pci_phys2); |
@@ -4966,7 +4965,7 @@ cy_detect_pci(void) | |||
4966 | /* allocate IRQ only if board has an IRQ */ | 4965 | /* allocate IRQ only if board has an IRQ */ |
4967 | if( (cy_pci_irq != 0) && (cy_pci_irq != 255) ) { | 4966 | if( (cy_pci_irq != 0) && (cy_pci_irq != 255) ) { |
4968 | if(request_irq(cy_pci_irq, cyz_interrupt, | 4967 | if(request_irq(cy_pci_irq, cyz_interrupt, |
4969 | SA_SHIRQ, "Cyclades-Z", &cy_card[j])) | 4968 | IRQF_SHARED, "Cyclades-Z", &cy_card[j])) |
4970 | { | 4969 | { |
4971 | printk("Cyclom-8Zo/PCI found at 0x%lx ", | 4970 | printk("Cyclom-8Zo/PCI found at 0x%lx ", |
4972 | (ulong) cy_pci_phys2); | 4971 | (ulong) cy_pci_phys2); |
@@ -5060,7 +5059,7 @@ cy_detect_pci(void) | |||
5060 | /* allocate IRQ only if board has an IRQ */ | 5059 | /* allocate IRQ only if board has an IRQ */ |
5061 | if( (cy_pci_irq != 0) && (cy_pci_irq != 255) ) { | 5060 | if( (cy_pci_irq != 0) && (cy_pci_irq != 255) ) { |
5062 | if(request_irq(cy_pci_irq, cyz_interrupt, | 5061 | if(request_irq(cy_pci_irq, cyz_interrupt, |
5063 | SA_SHIRQ, "Cyclades-Z", &cy_card[j])) | 5062 | IRQF_SHARED, "Cyclades-Z", &cy_card[j])) |
5064 | { | 5063 | { |
5065 | printk("Cyclom-Ze/PCI found at 0x%lx ", | 5064 | printk("Cyclom-Ze/PCI found at 0x%lx ", |
5066 | (ulong) cy_pci_phys2); | 5065 | (ulong) cy_pci_phys2); |