summaryrefslogtreecommitdiffstats
path: root/arch/m32r/platforms/mappi2/setup.c
diff options
context:
space:
mode:
authorGrant Likely <grant.likely@secretlab.ca>2010-12-29 22:20:30 -0700
committerGrant Likely <grant.likely@secretlab.ca>2010-12-29 22:21:47 -0700
commitd392da5207352f09030e95d9ea335a4225667ec0 (patch)
tree7d6cd1932afcad0a5619a5c504a6d93ca318187c /arch/m32r/platforms/mappi2/setup.c
parente39d5ef678045d61812c1401f04fe8edb14d6359 (diff)
parent387c31c7e5c9805b0aef8833d1731a5fe7bdea14 (diff)
downloadtalos-op-linux-d392da5207352f09030e95d9ea335a4225667ec0.tar.gz
talos-op-linux-d392da5207352f09030e95d9ea335a4225667ec0.zip
Merge v2.6.37-rc8 into powerpc/next
Diffstat (limited to 'arch/m32r/platforms/mappi2/setup.c')
-rw-r--r--arch/m32r/platforms/mappi2/setup.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/m32r/platforms/mappi2/setup.c b/arch/m32r/platforms/mappi2/setup.c
index 6a65eda0a056..c049376d0270 100644
--- a/arch/m32r/platforms/mappi2/setup.c
+++ b/arch/m32r/platforms/mappi2/setup.c
@@ -72,7 +72,7 @@ static void shutdown_mappi2_irq(unsigned int irq)
static struct irq_chip mappi2_irq_type =
{
- .typename = "MAPPI2-IRQ",
+ .name = "MAPPI2-IRQ",
.startup = startup_mappi2_irq,
.shutdown = shutdown_mappi2_irq,
.enable = enable_mappi2_irq,
OpenPOWER on IntegriCloud