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_alpha.c | |
| parent | CacheFiles: Update IMA counters when using dentry_open (diff) | |
| parent | alpha: Fixup last users of irq_chip->typename (diff) | |
| download | linux-df87f8c06c7f562ef9d93b9d674eebf2ffb96f6a.tar.gz linux-df87f8c06c7f562ef9d93b9d674eebf2ffb96f6a.tar.bz2 linux-df87f8c06c7f562ef9d93b9d674eebf2ffb96f6a.zip | |
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_alpha.c')
| -rw-r--r-- | arch/alpha/kernel/irq_alpha.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/alpha/kernel/irq_alpha.c b/arch/alpha/kernel/irq_alpha.c index 38c805dfc544..cfde865b78e0 100644 --- a/arch/alpha/kernel/irq_alpha.c +++ b/arch/alpha/kernel/irq_alpha.c @@ -228,7 +228,7 @@ struct irqaction timer_irqaction = { }; static struct irq_chip rtc_irq_type = { - .typename = "RTC", + .name = "RTC", .startup = rtc_startup, .shutdown = rtc_enable_disable, .enable = rtc_enable_disable, |