Skip to content

Commit 8c86942

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig
Renesas ARM defconfig updates for v6.5 - Refresh shmobile_defconfig for v6.4-rc1. * tag 'renesas-arm-defconfig-for-v6.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: ARM: shmobile: defconfig: Refresh for v6.4-rc1 Link: https://lore.kernel.org/r/cover.1685094240.git.geert+renesas@glider.be Signed-off-by: Arnd Bergmann <arnd@arndb.de>
2 parents 44c026a + 3f1e1ad commit 8c86942

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)