diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-10-22 22:34:09 +0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-10-22 22:34:09 +0400 |
| commit | f20e3b5fe7ead0615309433260b9784d8da0bbbd (patch) | |
| tree | eabb2e47a0355ac4e8024b7087b4e7cb9f324358 /drivers/parisc/dino.c | |
| parent | bcbfe664e7af019e698cef2feb85ac2b4f1ac11d (diff) | |
| parent | f030d7b65e4e6399f23de2a41a58d1b607b6bd89 (diff) | |
| download | linux-f20e3b5fe7ead0615309433260b9784d8da0bbbd.tar.xz | |
Merge branch 'for-rmk' of git://git.android.com/kernel into devel
Diffstat (limited to 'drivers/parisc/dino.c')
| -rw-r--r-- | drivers/parisc/dino.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/parisc/dino.c b/drivers/parisc/dino.c index fd56128525d1..3bc54b30c3a1 100644 --- a/drivers/parisc/dino.c +++ b/drivers/parisc/dino.c @@ -298,7 +298,8 @@ struct pci_port_ops dino_port_ops = { static void dino_disable_irq(unsigned int irq) { - struct dino_device *dino_dev = irq_desc[irq].chip_data; + struct irq_desc *desc = irq_to_desc(irq); + struct dino_device *dino_dev = desc->chip_data; int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); DBG(KERN_WARNING "%s(0x%p, %d)\n", __func__, dino_dev, irq); @@ -310,7 +311,8 @@ static void dino_disable_irq(unsigned int irq) static void dino_enable_irq(unsigned int irq) { - struct dino_device *dino_dev = irq_desc[irq].chip_data; + struct irq_desc *desc = irq_to_desc(irq); + struct dino_device *dino_dev = desc->chip_data; int local_irq = gsc_find_local_irq(irq, dino_dev->global_irq, DINO_LOCAL_IRQS); u32 tmp; |