Skip to content

Commit 3f1e1ad

Browse files
committed
ARM: shmobile: defconfig: Refresh for v6.4-rc1
Refresh the defconfig for Renesas ARM systems: - Move CONFIG_PCI_RCAR_GEN2=y (moved in commit 81c362e ("PCI: Sort controller Kconfig entries by vendor")), - Drop CONFIG_SERIAL_8250_PCI1XXXX=n (no longer auto-enabled since commit 5d943b5 ("serial: 8250_pci1xxxx: Disable SERIAL_8250_PCI1XXXX config by default")). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Link: https://lore.kernel.org/r/420669d925bf4a8527c80dd294568df3b0556058.1683705341.git.geert+renesas@glider.be
1 parent ac9a786 commit 3f1e1ad

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

arch/arm/configs/shmobile_defconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ CONFIG_NET_DSA=y
3636
CONFIG_CAN=y
3737
CONFIG_PCI=y
3838
CONFIG_PCI_MSI=y
39-
CONFIG_PCI_RCAR_GEN2=y
4039
CONFIG_PCIE_RCAR_HOST=y
40+
CONFIG_PCI_RCAR_GEN2=y
4141
CONFIG_DEVTMPFS=y
4242
CONFIG_DEVTMPFS_MOUNT=y
4343
CONFIG_MTD=y
@@ -76,7 +76,6 @@ CONFIG_SERIAL_8250=y
7676
# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
7777
CONFIG_SERIAL_8250_CONSOLE=y
7878
# CONFIG_SERIAL_8250_PCI is not set
79-
# CONFIG_SERIAL_8250_PCI1XXXX is not set
8079
CONFIG_SERIAL_8250_DW=y
8180
CONFIG_SERIAL_8250_EM=y
8281
# CONFIG_SERIAL_8250_PERICOM is not set

0 commit comments

Comments
 (0)