diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-08-07 04:55:03 -0400 |
| commit | 4fb8af10d0fd09372d52966b76922b9e82bbc950 (patch) | |
| tree | d240e4d40357583e3f3eb228dccf20122a5b31ed /arch/sh/kernel/cpu/sh4a/setup-sh7785.c | |
| parent | f44f82e8a20b98558486eb14497b2f71c78fa325 (diff) | |
| parent | 64a99d2a8c3ed5c4e39f3ae1cc682aa8fd3977fc (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes
Diffstat (limited to 'arch/sh/kernel/cpu/sh4a/setup-sh7785.c')
| -rw-r--r-- | arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c index 621e7329ec63..30baa63b24c8 100644 --- a/arch/sh/kernel/cpu/sh4a/setup-sh7785.c +++ b/arch/sh/kernel/cpu/sh4a/setup-sh7785.c | |||
| @@ -238,13 +238,18 @@ static struct intc_sense_reg sense_registers[] __initdata = { | |||
| 238 | IRQ4, IRQ5, IRQ6, IRQ7 } }, | 238 | IRQ4, IRQ5, IRQ6, IRQ7 } }, |
| 239 | }; | 239 | }; |
| 240 | 240 | ||
| 241 | static DECLARE_INTC_DESC(intc_desc_irq0123, "sh7785-irq0123", vectors_irq0123, | 241 | static struct intc_mask_reg ack_registers[] __initdata = { |
| 242 | NULL, mask_registers, prio_registers, | 242 | { 0xffd00024, 0, 32, /* INTREQ */ |
| 243 | sense_registers); | 243 | { IRQ0, IRQ1, IRQ2, IRQ3, IRQ4, IRQ5, IRQ6, IRQ7 } }, |
| 244 | }; | ||
| 245 | |||
| 246 | static DECLARE_INTC_DESC_ACK(intc_desc_irq0123, "sh7785-irq0123", | ||
| 247 | vectors_irq0123, NULL, mask_registers, | ||
| 248 | prio_registers, sense_registers, ack_registers); | ||
| 244 | 249 | ||
| 245 | static DECLARE_INTC_DESC(intc_desc_irq4567, "sh7785-irq4567", vectors_irq4567, | 250 | static DECLARE_INTC_DESC_ACK(intc_desc_irq4567, "sh7785-irq4567", |
| 246 | NULL, mask_registers, prio_registers, | 251 | vectors_irq4567, NULL, mask_registers, |
| 247 | sense_registers); | 252 | prio_registers, sense_registers, ack_registers); |
| 248 | 253 | ||
| 249 | /* External interrupt pins in IRL mode */ | 254 | /* External interrupt pins in IRL mode */ |
| 250 | 255 | ||