diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-05-26 13:38:53 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2023-05-26 13:38:54 +0200 |
| commit | 8c86942c02c5add74ba19fcb48d13b213f28e010 (patch) | |
| tree | 9f4cc086e2a6bcca405276eff08c38f8fdeee2ce /arch/arm | |
| parent | 44c026a73be8038f03dbdeef028b642880cf1511 (diff) | |
| parent | 3f1e1ad9230f8b1c415b432841db2b2850450fd4 (diff) | |
| download | linux-stable-8c86942c02c5add74ba19fcb48d13b213f28e010.tar.gz linux-stable-8c86942c02c5add74ba19fcb48d13b213f28e010.tar.bz2 linux-stable-8c86942c02c5add74ba19fcb48d13b213f28e010.zip | |
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>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/configs/shmobile_defconfig | 3 |
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 |