diff options
author | Olof Johansson <olof@lixom.net> | 2019-11-04 02:03:54 +0100 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2019-11-04 02:03:55 +0100 |
commit | 9a67a6ec9f7049e307726ef03bc94c7712fe14e4 (patch) | |
tree | f352771c5d3c517f10dba3fa300c430adc7fb25d /arch/arm/configs | |
parent | Merge tag 'hisi-arm64-defconfig-for-5.5' of git://github.com/hisilicon/linux-... (diff) | |
parent | ARM: shmobile: defconfig: Refresh for v5.4-rc1 (diff) | |
download | linux-9a67a6ec9f7049e307726ef03bc94c7712fe14e4.tar.xz linux-9a67a6ec9f7049e307726ef03bc94c7712fe14e4.zip |
Merge tag 'renesas-arm-defconfig-for-v5.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/defconfig
Renesas ARM defconfig updates for v5.5
- Refresh shmobile_defconfig for v5.4-rc1.
* tag 'renesas-arm-defconfig-for-v5.5-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
ARM: shmobile: defconfig: Refresh for v5.4-rc1
Link: https://lore.kernel.org/r/20191101155842.31467-2-geert+renesas@glider.be
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/configs')
-rw-r--r-- | arch/arm/configs/shmobile_defconfig | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index c6c70355141c..bda57cafa2bc 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -9,7 +9,6 @@ CONFIG_PERF_EVENTS=y CONFIG_SLAB=y CONFIG_ARCH_RENESAS=y CONFIG_PL310_ERRATA_588369=y -CONFIG_ARM_ERRATA_754322=y CONFIG_SMP=y CONFIG_SCHED_MC=y CONFIG_NR_CPUS=8 @@ -50,7 +49,6 @@ CONFIG_MTD_CFI=y CONFIG_MTD_CFI_INTELEXT=y CONFIG_MTD_PHYSMAP=y CONFIG_MTD_PHYSMAP_OF=y -CONFIG_MTD_M25P80=y CONFIG_MTD_SPI_NOR=y CONFIG_EEPROM_AT24=y CONFIG_BLK_DEV_SD=y @@ -130,7 +128,6 @@ CONFIG_DRM_SII902X=y CONFIG_DRM_I2C_ADV7511=y CONFIG_DRM_I2C_ADV7511_AUDIO=y CONFIG_FB_SH_MOBILE_LCDC=y -# CONFIG_LCD_CLASS_DEVICE is not set # CONFIG_BACKLIGHT_GENERIC is not set CONFIG_BACKLIGHT_PWM=y CONFIG_BACKLIGHT_AS3711=y |