summaryrefslogtreecommitdiff
path: root/arch/arm/configs
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert+renesas@glider.be>2023-05-10 09:56:43 +0200
committerGeert Uytterhoeven <geert+renesas@glider.be>2023-05-15 10:31:22 +0200
commit3f1e1ad9230f8b1c415b432841db2b2850450fd4 (patch)
tree2afe1122159d748474e674b8041e1089d6fe0588 /arch/arm/configs
parentac9a78681b921877518763ba0e89202254349d1b (diff)
ARM: shmobile: defconfig: Refresh for v6.4-rc1
Refresh the defconfig for Renesas ARM systems: - Move CONFIG_PCI_RCAR_GEN2=y (moved in commit 81c362e798d41592 ("PCI: Sort controller Kconfig entries by vendor")), - Drop CONFIG_SERIAL_8250_PCI1XXXX=n (no longer auto-enabled since commit 5d943b5d69c032de ("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
Diffstat (limited to 'arch/arm/configs')
-rw-r--r--arch/arm/configs/shmobile_defconfig3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig
index 0b21c0a47582..99748cff1ca4 100644
--- a/arch/arm/configs/shmobile_defconfig
+++ b/arch/arm/configs/shmobile_defconfig
@@ -36,8 +36,8 @@ CONFIG_NET_DSA=y
CONFIG_CAN=y
CONFIG_PCI=y
CONFIG_PCI_MSI=y
-CONFIG_PCI_RCAR_GEN2=y
CONFIG_PCIE_RCAR_HOST=y
+CONFIG_PCI_RCAR_GEN2=y
CONFIG_DEVTMPFS=y
CONFIG_DEVTMPFS_MOUNT=y
CONFIG_MTD=y
@@ -76,7 +76,6 @@ CONFIG_SERIAL_8250=y
# CONFIG_SERIAL_8250_16550A_VARIANTS is not set
CONFIG_SERIAL_8250_CONSOLE=y
# CONFIG_SERIAL_8250_PCI is not set
-# CONFIG_SERIAL_8250_PCI1XXXX is not set
CONFIG_SERIAL_8250_DW=y
CONFIG_SERIAL_8250_EM=y
# CONFIG_SERIAL_8250_PERICOM is not set