diff options
Diffstat (limited to 'drivers/misc')
| -rw-r--r-- | drivers/misc/ibmasm/ibmasm.h | 1 | ||||
| -rw-r--r-- | drivers/misc/ibmasm/module.c | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/drivers/misc/ibmasm/ibmasm.h b/drivers/misc/ibmasm/ibmasm.h index 6aba41954448..634d538ccd14 100644 --- a/drivers/misc/ibmasm/ibmasm.h +++ b/drivers/misc/ibmasm/ibmasm.h | |||
| @@ -29,7 +29,6 @@ | |||
| 29 | #include <linux/wait.h> | 29 | #include <linux/wait.h> |
| 30 | #include <linux/spinlock.h> | 30 | #include <linux/spinlock.h> |
| 31 | #include <linux/slab.h> | 31 | #include <linux/slab.h> |
| 32 | #include <linux/config.h> | ||
| 33 | #include <linux/module.h> | 32 | #include <linux/module.h> |
| 34 | #include <linux/interrupt.h> | 33 | #include <linux/interrupt.h> |
| 35 | #include <linux/device.h> | 34 | #include <linux/device.h> |
diff --git a/drivers/misc/ibmasm/module.c b/drivers/misc/ibmasm/module.c index 9706cc19134a..2f3bddfab937 100644 --- a/drivers/misc/ibmasm/module.c +++ b/drivers/misc/ibmasm/module.c | |||
| @@ -113,7 +113,7 @@ static int __devinit ibmasm_init_one(struct pci_dev *pdev, const struct pci_devi | |||
| 113 | goto error_ioremap; | 113 | goto error_ioremap; |
| 114 | } | 114 | } |
| 115 | 115 | ||
| 116 | result = request_irq(sp->irq, ibmasm_interrupt_handler, SA_SHIRQ, sp->devname, (void*)sp); | 116 | result = request_irq(sp->irq, ibmasm_interrupt_handler, IRQF_SHARED, sp->devname, (void*)sp); |
| 117 | if (result) { | 117 | if (result) { |
| 118 | dev_err(sp->dev, "Failed to register interrupt handler\n"); | 118 | dev_err(sp->dev, "Failed to register interrupt handler\n"); |
| 119 | goto error_request_irq; | 119 | goto error_request_irq; |
