From de1bd69abc68f74e27baf4c1b5a6062f01f5603a Mon Sep 17 00:00:00 2001 From: Yoichi Yuasa Date: Sat, 3 Sep 2005 15:56:14 -0700 Subject: [PATCH] --- yaml --- r: 6953 b: refs/heads/master c: 466adc66cf6eea0268c8678834c8c6a56e5a2f9e h: refs/heads/master i: 6951: be46f585dfa17d37297a62bec2e2c05450b7e207 v: v3 --- [refs] | 2 +- trunk/arch/mips/Kconfig | 12 +++--------- trunk/drivers/char/Kconfig | 2 -- 3 files changed, 4 insertions(+), 12 deletions(-) diff --git a/[refs] b/[refs] index 5169ce43e316..fce9b86f846a 100644 --- 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 index a83bc666e7ed..516a380f3218 100644 --- 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 index 116a7b185999..f418f45e0780 100644 --- 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"