]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
RISC-V: defconfig: Move CONFIG_PCI{,E_XILINX}
authorPalmer Dabbelt <palmer@sifive.com>
Wed, 23 Jan 2019 20:59:17 +0000 (12:59 -0800)
committerPalmer Dabbelt <palmer@sifive.com>
Wed, 23 Jan 2019 20:59:17 +0000 (12:59 -0800)
eb01d42a7778 ("PCI: consolidate PCI config entry in drivers/pci")
reorganized the PCI-related Kconfig entries and resulted in a diff in
our defconfig.  This simply removes the diff.

Signed-off-by: Palmer Dabbelt <palmer@sifive.com>
arch/riscv/configs/defconfig

index f399659d3b8d8caa07c7f989b01e5cf3cf440e75..658be23fa2c66ed738e9e494807aa10f9ff6a0a5 100644 (file)
@@ -13,8 +13,6 @@ CONFIG_BLK_DEV_INITRD=y
 CONFIG_EXPERT=y
 CONFIG_BPF_SYSCALL=y
 CONFIG_SMP=y
-CONFIG_PCI=y
-CONFIG_PCIE_XILINX=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 CONFIG_NET=y
@@ -28,6 +26,8 @@ CONFIG_IP_PNP_DHCP=y
 CONFIG_IP_PNP_BOOTP=y
 CONFIG_IP_PNP_RARP=y
 CONFIG_NETLINK_DIAG=y
+CONFIG_PCI=y
+CONFIG_PCIE_XILINX=y
 CONFIG_DEVTMPFS=y
 CONFIG_BLK_DEV_LOOP=y
 CONFIG_VIRTIO_BLK=y