Skip to content

Commit bb57e36

Browse files
committed
Merge tag 'renesas-arm-defconfig-for-v7.1-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/defconfig
Renesas ARM defconfig updates for v7.1 - Refresh the ARM SH-Mobile defconfig for v7.0-rc1. * tag 'renesas-arm-defconfig-for-v7.1-tag1' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: ARM: shmobile: defconfig: Refresh for v7.0-rc1 Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
2 parents 6de23f8 + 8c6ccce commit bb57e36

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

arch/arm/configs/shmobile_defconfig

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -140,17 +140,17 @@ CONFIG_VIDEO_ADV7604_CEC=y
140140
CONFIG_VIDEO_ML86V7667=y
141141
CONFIG_DRM=y
142142
CONFIG_DRM_FBDEV_EMULATION=y
143-
CONFIG_DRM_RCAR_DU=y
144-
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
145-
CONFIG_DRM_SHMOBILE=y
146-
CONFIG_DRM_PANEL_EDP=y
147-
CONFIG_DRM_PANEL_SIMPLE=y
148143
CONFIG_DRM_DISPLAY_CONNECTOR=y
149144
CONFIG_DRM_LVDS_CODEC=y
150145
CONFIG_DRM_SII902X=y
151146
CONFIG_DRM_SIMPLE_BRIDGE=y
152147
CONFIG_DRM_I2C_ADV7511=y
153148
CONFIG_DRM_I2C_ADV7511_AUDIO=y
149+
CONFIG_DRM_PANEL_EDP=y
150+
CONFIG_DRM_PANEL_SIMPLE=y
151+
CONFIG_DRM_RCAR_DU=y
152+
# CONFIG_DRM_RCAR_USE_MIPI_DSI is not set
153+
CONFIG_DRM_SHMOBILE=y
154154
CONFIG_FB_DEVICE=y
155155
CONFIG_BACKLIGHT_PWM=y
156156
CONFIG_BACKLIGHT_AS3711=y
@@ -217,7 +217,6 @@ CONFIG_TMPFS=y
217217
CONFIG_NFS_FS=y
218218
CONFIG_NFS_V3_ACL=y
219219
CONFIG_NFS_V4=y
220-
CONFIG_NFS_V4_1=y
221220
CONFIG_ROOT_NFS=y
222221
CONFIG_NLS_CODEPAGE_437=y
223222
CONFIG_NLS_ISO8859_1=y

0 commit comments

Comments
 (0)