diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-31 03:00:26 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-03-31 03:00:26 +0200 |
| commit | d17abcd5417d84cfa8a225160481203a37dc81d4 (patch) | |
| tree | 74ce2c425c5c6550acec90bc92c8a3f735f0d257 /arch/mips/sni | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-lguest-an... (diff) | |
| parent | oprofile: Thou shalt not call __exit functions from __init functions (diff) | |
| download | linux-d17abcd5417d84cfa8a225160481203a37dc81d4.tar.xz linux-d17abcd5417d84cfa8a225160481203a37dc81d4.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-cpumask:
oprofile: Thou shalt not call __exit functions from __init functions
cpumask: remove the now-obsoleted pcibus_to_cpumask(): generic
cpumask: remove cpumask_t from core
cpumask: convert rcutorture.c
cpumask: use new cpumask_ functions in core code.
cpumask: remove references to struct irqaction's mask field.
cpumask: use mm_cpumask() wrapper: kernel/fork.c
cpumask: use set_cpu_active in init/main.c
cpumask: remove node_to_first_cpu
cpumask: fix seq_bitmap_*() functions.
cpumask: remove dangerous CPU_MASK_ALL_PTR, &CPU_MASK_ALL
Diffstat (limited to 'arch/mips/sni')
| -rw-r--r-- | arch/mips/sni/rm200.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mips/sni/rm200.c b/arch/mips/sni/rm200.c index b4352a0c8151..5e687819cbc2 100644 --- a/arch/mips/sni/rm200.c +++ b/arch/mips/sni/rm200.c @@ -359,7 +359,8 @@ void sni_rm200_init_8259A(void) * IRQ2 is cascade interrupt to second interrupt controller */ static struct irqaction sni_rm200_irq2 = { - no_action, 0, CPU_MASK_NONE, "cascade", NULL, NULL + .handler = no_action, + .name = "cascade", }; static struct resource sni_rm200_pic1_resource = { |