diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2007-02-13 01:43:25 -0500 |
| commit | d9bc125caf592b7d081021f32ce5b717efdf70c8 (patch) | |
| tree | 263b7066ba22ddce21db610c0300f6eaac6f2064 /arch/mips/pmc-sierra/yosemite/irq.c | |
| parent | 43d78ef2ba5bec26d0315859e8324bfc0be23766 (diff) | |
| parent | ec2f9d1331f658433411c58077871e1eef4ee1b4 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
net/sunrpc/auth_gss/gss_krb5_crypto.c
net/sunrpc/auth_gss/gss_spkm3_token.c
net/sunrpc/clnt.c
Merge with mainline and fix conflicts.
Diffstat (limited to 'arch/mips/pmc-sierra/yosemite/irq.c')
| -rw-r--r-- | arch/mips/pmc-sierra/yosemite/irq.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/pmc-sierra/yosemite/irq.c b/arch/mips/pmc-sierra/yosemite/irq.c index adb048527e76..428d1f45a287 100644 --- a/arch/mips/pmc-sierra/yosemite/irq.c +++ b/arch/mips/pmc-sierra/yosemite/irq.c | |||
| @@ -148,9 +148,9 @@ void __init arch_init_irq(void) | |||
| 148 | { | 148 | { |
| 149 | clear_c0_status(ST0_IM); | 149 | clear_c0_status(ST0_IM); |
| 150 | 150 | ||
| 151 | mips_cpu_irq_init(0); | 151 | mips_cpu_irq_init(); |
| 152 | rm7k_cpu_irq_init(8); | 152 | rm7k_cpu_irq_init(); |
| 153 | rm9k_cpu_irq_init(12); | 153 | rm9k_cpu_irq_init(); |
| 154 | 154 | ||
| 155 | #ifdef CONFIG_KGDB | 155 | #ifdef CONFIG_KGDB |
| 156 | /* At this point, initialize the second serial port */ | 156 | /* At this point, initialize the second serial port */ |