diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-07-31 20:37:25 -0400 |
| commit | 57cad8084e0837e0f2c97da789ec9b3f36809be9 (patch) | |
| tree | e9c790afb4286f78cb08d9664f58baa7e876fe55 /arch/mips/pci/fixup-mpc30x.c | |
| parent | cb18bd40030c879cd93fef02fd579f74dbab473d (diff) | |
| parent | 49b1e3ea19b1c95c2f012b8331ffb3b169e4c042 (diff) | |
Merge branch 'merge'
Diffstat (limited to 'arch/mips/pci/fixup-mpc30x.c')
| -rw-r--r-- | arch/mips/pci/fixup-mpc30x.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/mips/pci/fixup-mpc30x.c b/arch/mips/pci/fixup-mpc30x.c index b67ddaa47122..3c9ae41f7517 100644 --- a/arch/mips/pci/fixup-mpc30x.c +++ b/arch/mips/pci/fixup-mpc30x.c | |||
| @@ -21,7 +21,6 @@ | |||
| 21 | #include <linux/pci.h> | 21 | #include <linux/pci.h> |
| 22 | 22 | ||
| 23 | #include <asm/vr41xx/mpc30x.h> | 23 | #include <asm/vr41xx/mpc30x.h> |
| 24 | #include <asm/vr41xx/vrc4173.h> | ||
| 25 | 24 | ||
| 26 | static const int internal_func_irqs[] __initdata = { | 25 | static const int internal_func_irqs[] __initdata = { |
| 27 | VRC4173_CASCADE_IRQ, | 26 | VRC4173_CASCADE_IRQ, |