---

yaml --- r: 6953 b: refs/heads/master c: 466adc6 h: refs/heads/master i: 6951: be46f58 v: v3
git-mirror · Sep 5, 2005 · de1bd69 · de1bd69
1 parent cd169d8
commit de1bd69
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 12 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8dd4aebe49b24348e48581af835ac41c8e483d68
+refs/heads/master: 466adc66cf6eea0268c8678834c8c6a56e5a2f9e
diff --git a/trunk/arch/mips/Kconfig b/trunk/arch/mips/Kconfig
@@ -80,8 +80,6 @@ config NEC_CMBVR4133
 	select DMA_NONCOHERENT
 	select IRQ_CPU
 	select HW_HAS_PCI
-	select PCI
-	select PCI_VR41XX
 
 config ROCKHOPPER
 	bool "Support for Rockhopper baseboard"
@@ -122,8 +120,6 @@ config TANBAC_TB022X
 config TANBAC_TB0226
 	bool "Support for TANBAC Mbase(TB0226)"
 	depends on TANBAC_TB022X
-	select PCI
-	select PCI_VR41XX
 	select GPIO_VR41XX
 	help
 	  The TANBAC Mbase(TB0226) is a MIPS-based platform manufactured by TANBAC.
@@ -136,8 +132,6 @@ config VICTOR_MPC30X
 	select DMA_NONCOHERENT
 	select IRQ_CPU
 	select HW_HAS_PCI
-	select PCI
-	select PCI_VR41XX
 
 config ZAO_CAPCELLA
 	bool "Support for ZAO Networks Capcella"
@@ -146,12 +140,12 @@ config ZAO_CAPCELLA
 	select DMA_NONCOHERENT
 	select IRQ_CPU
 	select HW_HAS_PCI
-	select PCI
-	select PCI_VR41XX
 
 config PCI_VR41XX
 	bool "Add PCI control unit support of NEC VR4100 series"
-	depends on MACH_VR41XX && PCI
+	depends on MACH_VR41XX && HW_HAS_PCI
+	default y
+	select PCI
 
 config VRC4171
 	tristate "Add NEC VRC4171 companion chip support"

diff --git a/trunk/drivers/char/Kconfig b/trunk/drivers/char/Kconfig
@@ -843,8 +843,6 @@ config SONYPI
 config TANBAC_TB0219
 	tristate "TANBAC TB0219 base board support"
 	depends TANBAC_TB022X
-	select PCI
-	select PCI_VR41XX
 
 menu "Ftape, the floppy tape device driver"