diff options
Diffstat (limited to 'arch/mips/pci')
-rw-r--r-- | arch/mips/pci/Makefile | 2 | ||||
-rw-r--r-- | arch/mips/pci/fixup-jmr3927.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/fixup-rbtx4927.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/fixup-rbtx4938.c (renamed from arch/mips/pci/fixup-tx4938.c) | 2 | ||||
-rw-r--r-- | arch/mips/pci/ops-tx3927.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/ops-tx4927.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/ops-tx4938.c | 2 | ||||
-rw-r--r-- | arch/mips/pci/pci-jmr3927.c | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile index 80fa5abb25d4..4608e43de28c 100644 --- a/arch/mips/pci/Makefile +++ b/arch/mips/pci/Makefile | |||
@@ -43,7 +43,7 @@ obj-$(CONFIG_TANBAC_TB0226) += fixup-tb0226.o | |||
43 | obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o | 43 | obj-$(CONFIG_TANBAC_TB0287) += fixup-tb0287.o |
44 | obj-$(CONFIG_TOSHIBA_JMR3927) += fixup-jmr3927.o pci-jmr3927.o | 44 | obj-$(CONFIG_TOSHIBA_JMR3927) += fixup-jmr3927.o pci-jmr3927.o |
45 | obj-$(CONFIG_TOSHIBA_RBTX4927) += fixup-rbtx4927.o ops-tx4927.o | 45 | obj-$(CONFIG_TOSHIBA_RBTX4927) += fixup-rbtx4927.o ops-tx4927.o |
46 | obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-tx4938.o ops-tx4938.o | 46 | obj-$(CONFIG_TOSHIBA_RBTX4938) += fixup-rbtx4938.o ops-tx4938.o |
47 | obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o | 47 | obj-$(CONFIG_VICTOR_MPC30X) += fixup-mpc30x.o |
48 | obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o | 48 | obj-$(CONFIG_ZAO_CAPCELLA) += fixup-capcella.o |
49 | obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o | 49 | obj-$(CONFIG_WR_PPMC) += fixup-wrppmc.o |
diff --git a/arch/mips/pci/fixup-jmr3927.c b/arch/mips/pci/fixup-jmr3927.c index e974394be7bc..41dcd6a3aae5 100644 --- a/arch/mips/pci/fixup-jmr3927.c +++ b/arch/mips/pci/fixup-jmr3927.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <linux/pci.h> | 31 | #include <linux/pci.h> |
32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
33 | 33 | ||
34 | #include <asm/jmr3927/jmr3927.h> | 34 | #include <asm/txx9/jmr3927.h> |
35 | 35 | ||
36 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) | 36 | int __init pcibios_map_irq(const struct pci_dev *dev, u8 slot, u8 pin) |
37 | { | 37 | { |
diff --git a/arch/mips/pci/fixup-rbtx4927.c b/arch/mips/pci/fixup-rbtx4927.c index 2d234ca017db..26013badfe1f 100644 --- a/arch/mips/pci/fixup-rbtx4927.c +++ b/arch/mips/pci/fixup-rbtx4927.c | |||
@@ -37,7 +37,7 @@ | |||
37 | #include <linux/kernel.h> | 37 | #include <linux/kernel.h> |
38 | #include <linux/init.h> | 38 | #include <linux/init.h> |
39 | 39 | ||
40 | #include <asm/tx4927/tx4927.h> | 40 | #include <asm/txx9/tx4927.h> |
41 | 41 | ||
42 | #undef DEBUG | 42 | #undef DEBUG |
43 | #ifdef DEBUG | 43 | #ifdef DEBUG |
diff --git a/arch/mips/pci/fixup-tx4938.c b/arch/mips/pci/fixup-rbtx4938.c index f2ba06ee0c10..64d4510c0265 100644 --- a/arch/mips/pci/fixup-tx4938.c +++ b/arch/mips/pci/fixup-rbtx4938.c | |||
@@ -14,7 +14,7 @@ | |||
14 | #include <linux/kernel.h> | 14 | #include <linux/kernel.h> |
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | 16 | ||
17 | #include <asm/tx4938/rbtx4938.h> | 17 | #include <asm/txx9/rbtx4938.h> |
18 | 18 | ||
19 | extern struct pci_controller tx4938_pci_controller[]; | 19 | extern struct pci_controller tx4938_pci_controller[]; |
20 | 20 | ||
diff --git a/arch/mips/pci/ops-tx3927.c b/arch/mips/pci/ops-tx3927.c index aa698bd0d5e3..5d398f694682 100644 --- a/arch/mips/pci/ops-tx3927.c +++ b/arch/mips/pci/ops-tx3927.c | |||
@@ -39,7 +39,7 @@ | |||
39 | #include <linux/init.h> | 39 | #include <linux/init.h> |
40 | 40 | ||
41 | #include <asm/addrspace.h> | 41 | #include <asm/addrspace.h> |
42 | #include <asm/jmr3927/jmr3927.h> | 42 | #include <asm/txx9/jmr3927.h> |
43 | 43 | ||
44 | static inline int mkaddr(unsigned char bus, unsigned char dev_fn, | 44 | static inline int mkaddr(unsigned char bus, unsigned char dev_fn, |
45 | unsigned char where) | 45 | unsigned char where) |
diff --git a/arch/mips/pci/ops-tx4927.c b/arch/mips/pci/ops-tx4927.c index 1bbafeb4a774..54730eee451b 100644 --- a/arch/mips/pci/ops-tx4927.c +++ b/arch/mips/pci/ops-tx4927.c | |||
@@ -40,7 +40,7 @@ | |||
40 | #include <linux/pci.h> | 40 | #include <linux/pci.h> |
41 | #include <linux/kernel.h> | 41 | #include <linux/kernel.h> |
42 | #include <linux/init.h> | 42 | #include <linux/init.h> |
43 | #include <asm/tx4927/tx4927.h> | 43 | #include <asm/txx9/tx4927.h> |
44 | 44 | ||
45 | /* initialize in setup */ | 45 | /* initialize in setup */ |
46 | struct resource pci_io_resource = { | 46 | struct resource pci_io_resource = { |
diff --git a/arch/mips/pci/ops-tx4938.c b/arch/mips/pci/ops-tx4938.c index a450c4062031..34494b82cb22 100644 --- a/arch/mips/pci/ops-tx4938.c +++ b/arch/mips/pci/ops-tx4938.c | |||
@@ -15,7 +15,7 @@ | |||
15 | #include <linux/init.h> | 15 | #include <linux/init.h> |
16 | 16 | ||
17 | #include <asm/addrspace.h> | 17 | #include <asm/addrspace.h> |
18 | #include <asm/tx4938/rbtx4938.h> | 18 | #include <asm/txx9/rbtx4938.h> |
19 | 19 | ||
20 | /* initialize in setup */ | 20 | /* initialize in setup */ |
21 | struct resource pci_io_resource = { | 21 | struct resource pci_io_resource = { |
diff --git a/arch/mips/pci/pci-jmr3927.c b/arch/mips/pci/pci-jmr3927.c index cb84f4e8ccae..7fb6bd71901a 100644 --- a/arch/mips/pci/pci-jmr3927.c +++ b/arch/mips/pci/pci-jmr3927.c | |||
@@ -31,7 +31,7 @@ | |||
31 | #include <linux/kernel.h> | 31 | #include <linux/kernel.h> |
32 | #include <linux/init.h> | 32 | #include <linux/init.h> |
33 | 33 | ||
34 | #include <asm/jmr3927/jmr3927.h> | 34 | #include <asm/txx9/jmr3927.h> |
35 | #include <asm/debug.h> | 35 | #include <asm/debug.h> |
36 | 36 | ||
37 | struct resource pci_io_resource = { | 37 | struct resource pci_io_resource = { |