aboutsummaryrefslogtreecommitdiffstats
path: root/arch/alpha/kernel/sys_rx164.c
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2009-12-03 13:49:39 +0100
committerJens Axboe <jens.axboe@oracle.com>2009-12-03 13:49:39 +0100
commit220d0b1dbf78c6417a658c96e571415552d3abac (patch)
tree70cd3862540c38ea490e7a27c3c7acc35b680234 /arch/alpha/kernel/sys_rx164.c
parent474b18ccc264c472abeec50f48469b6477202699 (diff)
parent22763c5cf3690a681551162c15d34d935308c8d7 (diff)
downloadkernel_samsung_espresso10-220d0b1dbf78c6417a658c96e571415552d3abac.zip
kernel_samsung_espresso10-220d0b1dbf78c6417a658c96e571415552d3abac.tar.gz
kernel_samsung_espresso10-220d0b1dbf78c6417a658c96e571415552d3abac.tar.bz2
Merge branch 'master' into for-2.6.33
Diffstat (limited to 'arch/alpha/kernel/sys_rx164.c')
-rw-r--r--arch/alpha/kernel/sys_rx164.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_rx164.c b/arch/alpha/kernel/sys_rx164.c
index fc92463..be16112 100644
--- a/arch/alpha/kernel/sys_rx164.c
+++ b/arch/alpha/kernel/sys_rx164.c
@@ -73,7 +73,7 @@ rx164_end_irq(unsigned int irq)
}
static struct irq_chip rx164_irq_type = {
- .typename = "RX164",
+ .name = "RX164",
.startup = rx164_startup_irq,
.shutdown = rx164_disable_irq,
.enable = rx164_enable_irq,