diff options
| author | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-20 12:47:40 -0500 |
| commit | 9a21247181d93fdf99255911845ecdb041d21583 (patch) | |
| tree | 6d69be36f8a2bd8c76bf02ead2f0121a511c0a92 /arch/mips/momentum/ocelot_c/irq.c | |
| parent | c752666c17f870fa8ae9f16804dd457e9e6daaec (diff) | |
| parent | 7705a8792b0fc82fd7d4dd923724606bbfd9fb20 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/mips/momentum/ocelot_c/irq.c')
| -rw-r--r-- | arch/mips/momentum/ocelot_c/irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/momentum/ocelot_c/irq.c b/arch/mips/momentum/ocelot_c/irq.c index 300fe8e4fbe8..a5764bc20e36 100644 --- a/arch/mips/momentum/ocelot_c/irq.c +++ b/arch/mips/momentum/ocelot_c/irq.c | |||
| @@ -41,11 +41,11 @@ | |||
| 41 | #include <linux/slab.h> | 41 | #include <linux/slab.h> |
| 42 | #include <linux/random.h> | 42 | #include <linux/random.h> |
| 43 | #include <linux/bitops.h> | 43 | #include <linux/bitops.h> |
| 44 | #include <linux/mv643xx.h> | ||
| 44 | #include <asm/bootinfo.h> | 45 | #include <asm/bootinfo.h> |
| 45 | #include <asm/io.h> | 46 | #include <asm/io.h> |
| 46 | #include <asm/irq_cpu.h> | 47 | #include <asm/irq_cpu.h> |
| 47 | #include <asm/mipsregs.h> | 48 | #include <asm/mipsregs.h> |
| 48 | #include <asm/mv64340.h> | ||
| 49 | #include <asm/system.h> | 49 | #include <asm/system.h> |
| 50 | 50 | ||
| 51 | extern asmlinkage void ocelot_handle_int(void); | 51 | extern asmlinkage void ocelot_handle_int(void); |