diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2007-02-18 06:31:14 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2007-02-18 06:31:14 -0500 |
| commit | 3b0eb4a195a124567cd0dd6f700f8388def542c6 (patch) | |
| tree | a5302057b2d2bdfb2072cb2ff0df9e1c0990345c /arch/arm/mach-iop32x | |
| parent | 8213084125eed3c5efbc5e13739b93dfedb88590 (diff) | |
| parent | 588ef7693574cfbcb228f48d5478c2b39a9b0c9f (diff) | |
Merge the easy part of the IOP branch
Diffstat (limited to 'arch/arm/mach-iop32x')
| -rw-r--r-- | arch/arm/mach-iop32x/irq.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mach-iop32x/irq.c b/arch/arm/mach-iop32x/irq.c index 3ec1cd5c4f99..8b0ac5590ae4 100644 --- a/arch/arm/mach-iop32x/irq.c +++ b/arch/arm/mach-iop32x/irq.c | |||
| @@ -60,6 +60,8 @@ void __init iop32x_init_irq(void) | |||
| 60 | { | 60 | { |
| 61 | int i; | 61 | int i; |
| 62 | 62 | ||
| 63 | iop_init_cp6_handler(); | ||
| 64 | |||
| 63 | intctl_write(0); | 65 | intctl_write(0); |
| 64 | intstr_write(0); | 66 | intstr_write(0); |
| 65 | if (machine_is_glantank() || | 67 | if (machine_is_glantank() || |