diff options
Diffstat (limited to 'drivers/parisc/dino.c')
-rw-r--r-- | drivers/parisc/dino.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index 6e8ed0c81a6c..0d96c50ffe9c 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c | |||
@@ -43,7 +43,6 @@ | |||
43 | ** for PCI drivers devices which implement/use MMIO registers. | 43 | ** for PCI drivers devices which implement/use MMIO registers. |
44 | */ | 44 | */ |
45 | 45 | ||
46 | #include <linux/config.h> | ||
47 | #include <linux/delay.h> | 46 | #include <linux/delay.h> |
48 | #include <linux/types.h> | 47 | #include <linux/types.h> |
49 | #include <linux/kernel.h> | 48 | #include <linux/kernel.h> |
@@ -299,7 +298,7 @@ struct pci_port_ops dino_port_ops = { | |||
299 | 298 | ||
300 | static void dino_disable_irq(unsigned int irq) | 299 | static void dino_disable_irq(unsigned int irq) |
301 | { | 300 | { |
302 | struct dino_device *dino_dev = irq_desc[irq].handler_data; | 301 | struct dino_device *dino_dev = irq_desc[irq].chip_data; |
303 | int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); | 302 | int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); |
304 | 303 | ||
305 | DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq); | 304 | DBG(KERN_WARNING "%s(0x%p, %d)\n", __FUNCTION__, dino_dev, irq); |
@@ -311,7 +310,7 @@ static void dino_disable_irq(unsigned int irq) | |||
311 | 310 | ||
312 | static void dino_enable_irq(unsigned int irq) | 311 | static void dino_enable_irq(unsigned int irq) |
313 | { | 312 | { |
314 | struct dino_device *dino_dev = irq_desc[irq].handler_data; | 313 | struct dino_device *dino_dev = irq_desc[irq].chip_data; |
315 | int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); | 314 | int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); |
316 | u32 tmp; | 315 | u32 tmp; |
317 | 316 | ||