diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 23:32:24 +0200 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2009-09-08 23:32:24 +0200 |
| commit | a348a7e6fdbcd2d5192a09719a479bb238fde727 (patch) | |
| tree | 5ff94185f4e5a810777469d7fe7832a8ec2d3430 /arch/m32r/platforms/mappi/setup.c | |
| parent | dmaengine: at_hdmac: add DMA slave transfers (diff) | |
| parent | Linux 2.6.31-rc1 (diff) | |
| download | linux-a348a7e6fdbcd2d5192a09719a479bb238fde727.tar.xz linux-a348a7e6fdbcd2d5192a09719a479bb238fde727.zip | |
Merge commit 'v2.6.31-rc1' into dmaengine
Diffstat (limited to 'arch/m32r/platforms/mappi/setup.c')
| -rw-r--r-- | arch/m32r/platforms/mappi/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/platforms/mappi/setup.c b/arch/m32r/platforms/mappi/setup.c index 3ec087ff2214..fb4b17799b66 100644 --- a/arch/m32r/platforms/mappi/setup.c +++ b/arch/m32r/platforms/mappi/setup.c @@ -63,7 +63,7 @@ static void shutdown_mappi_irq(unsigned int irq) outl(M32R_ICUCR_ILEVEL7, port); } -static struct hw_interrupt_type mappi_irq_type = +static struct irq_chip mappi_irq_type = { .typename = "MAPPI-IRQ", .startup = startup_mappi_irq, |