[MIPS] merge GT64111 PCI routines and GT64120 PCI_0 routines

This patch has merged GT64111 PCI routines and GT64120 PCI_0 routines.
GT64111 PCI is almost the same as GT64120's PCI_0.
This patch don't change GT64120 PCI routines.

Signed-off-by: Yoichi Yuasa <yoichi_yuasa@tripeaks.co.jp>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

1 files changed, 8 insertions, 11 deletions

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index c78b14380b3e..2fd82e548187 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -165,7 +165,7 @@ config MIPS_COBALT
         select HW_HAS_PCI
         select I8259
         select IRQ_CPU
-        select MIPS_GT64111
+        select PCI_GT64XXX_PCI0
         select SYS_HAS_CPU_NEVADA
         select SYS_HAS_EARLY_PRINTK
         select SYS_SUPPORTS_32BIT_KERNEL
@@ -207,7 +207,7 @@ config MIPS_EV64120
         depends on EXPERIMENTAL
         select DMA_NONCOHERENT
         select HW_HAS_PCI
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select SYS_HAS_CPU_R5000
         select SYS_SUPPORTS_32BIT_KERNEL
         select SYS_SUPPORTS_64BIT_KERNEL
@@ -245,7 +245,7 @@ config LASAT
         select DMA_NONCOHERENT
         select SYS_HAS_EARLY_PRINTK
         select HW_HAS_PCI
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select MIPS_NILE4
         select R5000_CPU_SCACHE
         select SYS_HAS_CPU_R5000
@@ -263,7 +263,7 @@ config MIPS_ATLAS
         select HW_HAS_PCI
         select MIPS_BOARDS_GEN
         select MIPS_BONITO64
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select MIPS_MSC
         select RM7000_CPU_SCACHE
         select SWAP_IO_SPACE
@@ -296,7 +296,7 @@ config MIPS_MALTA
         select MIPS_BOARDS_GEN
         select MIPS_BONITO64
         select MIPS_CPU_SCACHE
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select MIPS_MSC
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_MIPS32_R1
@@ -340,7 +340,7 @@ config WR_PPMC
         select BOOT_ELF32
         select DMA_NONCOHERENT
         select HW_HAS_PCI
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_MIPS32_R1
         select SYS_HAS_CPU_MIPS32_R2
@@ -398,7 +398,7 @@ config MOMENCO_OCELOT
         select HW_HAS_PCI
         select IRQ_CPU
         select IRQ_CPU_RM7K
-        select MIPS_GT64120
+        select PCI_GT64XXX_PCI0
         select RM7000_CPU_SCACHE
         select SWAP_IO_SPACE
         select SYS_HAS_CPU_RM7000
@@ -999,10 +999,7 @@ config DDB5XXX_COMMON
 config MIPS_BOARDS_GEN
         bool
 
-config MIPS_GT64111
-        bool
-
-config MIPS_GT64120
+config PCI_GT64XXX_PCI0
         bool
 
 config MIPS_TX3927