aboutsummaryrefslogtreecommitdiff
path: root/arch/alpha/kernel/sys_wildfire.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-12-01 07:36:23 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-12-01 07:36:23 -0800
commitdf87f8c06c7f562ef9d93b9d674eebf2ffb96f6a (patch)
tree3a08bcba2f61bb4ffaac8dc1127ec6c5815e0563 /arch/alpha/kernel/sys_wildfire.c
parent3350b2acdd39d23db52710045536b943fe38a35c (diff)
parent8ab1221c20255f35d85664a046549bc6135122c2 (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha-2.6: alpha: Fixup last users of irq_chip->typename Alpha: Rearrange thread info flags fixing two regressions arch/alpha/kernel: Add kmalloc NULL tests arch/alpha/kernel/sys_ruffian.c: Use DIV_ROUND_CLOSEST
Diffstat (limited to 'arch/alpha/kernel/sys_wildfire.c')
-rw-r--r--arch/alpha/kernel/sys_wildfire.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/sys_wildfire.c b/arch/alpha/kernel/sys_wildfire.c
index e91b4c3838a..62fd972e18e 100644
--- a/arch/alpha/kernel/sys_wildfire.c
+++ b/arch/alpha/kernel/sys_wildfire.c
@@ -158,7 +158,7 @@ wildfire_end_irq(unsigned int irq)
}
static struct irq_chip wildfire_irq_type = {
- .typename = "WILDFIRE",
+ .name = "WILDFIRE",
.startup = wildfire_startup_irq,
.shutdown = wildfire_disable_irq,
.enable = wildfire_enable_irq,