diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-01 07:36:23 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-01 07:36:23 -0800 |
| commit | df87f8c06c7f562ef9d93b9d674eebf2ffb96f6a (patch) | |
| tree | 3a08bcba2f61bb4ffaac8dc1127ec6c5815e0563 /arch/alpha/kernel/irq_srm.c | |
| parent | 3350b2acdd39d23db52710045536b943fe38a35c (diff) | |
| parent | 8ab1221c20255f35d85664a046549bc6135122c2 (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/irq_srm.c')
| -rw-r--r-- | arch/alpha/kernel/irq_srm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/irq_srm.c b/arch/alpha/kernel/irq_srm.c index 85229369a1f..d63e93e1e8b 100644 --- a/arch/alpha/kernel/irq_srm.c +++ b/arch/alpha/kernel/irq_srm.c @@ -49,7 +49,7 @@ srm_end_irq(unsigned int irq) /* Handle interrupts from the SRM, assuming no additional weirdness. */ static struct irq_chip srm_irq_type = { - .typename = "SRM", + .name = "SRM", .startup = srm_startup_irq, .shutdown = srm_disable_irq, .enable = srm_enable_irq, |