diff options
author | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 11:17:41 +0900 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2009-04-02 11:17:41 +0900 |
commit | c4361bb64b81f5b81a7a08d58654493385a2f2b2 (patch) | |
tree | 8741c0b60ddfbc3fc4e17c8d200f6aa6ff32cca0 /arch/mips/sni/rm200.c | |
parent | 46368fa05164e1afdc1401294908cf30c6d8d981 (diff) | |
parent | 833bb3046b6cb320e775ea2160ddca87d53260d5 (diff) | |
download | kernel_goldelico_gta04-c4361bb64b81f5b81a7a08d58654493385a2f2b2.zip kernel_goldelico_gta04-c4361bb64b81f5b81a7a08d58654493385a2f2b2.tar.gz kernel_goldelico_gta04-c4361bb64b81f5b81a7a08d58654493385a2f2b2.tar.bz2 |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/mips/sni/rm200.c')
-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 b4352a0..5e68781 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 = { |