The way how CONFIG_PCI_QSPAN selects the CONFIG_PCI default is highly unusual and gets in the way of moving CONFIG_PCI into drivers/pci/Kconfig. Simplify it by just having it depend on CONFIG_PCI. Signed-off-by: Christoph Hellwig <hch@xxxxxx> --- arch/powerpc/Kconfig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index a80669209155..6fa6f92edb7f 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -955,7 +955,6 @@ config PCI bool "PCI support" if PPC_PCI_CHOICE default y if !40x && !CPM2 && !PPC_8xx && !PPC_83xx \ && !PPC_85xx && !PPC_86xx && !GAMECUBE_COMMON - default PCI_QSPAN if PPC_8xx select GENERIC_PCI_IOMAP help Find out whether your system includes a PCI bus. PCI is the name of @@ -971,7 +970,7 @@ config PCI_SYSCALL config PCI_QSPAN bool "QSpan PCI" - depends on PPC_8xx + depends on PPC_8xx && PCI select PPC_I8259 help Say Y here if you have a system based on a Motorola 8xx-series -- 2.19.1
