On 17.11.2015 10:49, Timo Sigurdsson wrote: > Commit 3d0b16a66c8a ("nvmem: sunxi: Move the SID driver to the nvmem > framework") moved the the sunxi SID driver to a new framework, but left > multi_v7_defconfig with the deprecated config symbol EEPROM_SUNXI_SID > instead of the new symbold NVMEM_SUNXI_SID. Hence, re-enable the driver > in multi_v7_defconfig. > > While at it, clean up multi_v7_defconfig by generating a fresh file via > make multi_v7_defconfig > make savedefconfig > While this moves around a few lines and removes unnecessary symbols, > it doesn't introduce any functional changes.
Split it per change. One change is savedefconfig and second is removing or enabling other drivers. On which tree you generated the defconfig? There is a minor nit below (at least for Exynos platform, I did not checked the others). > > Signed-off-by: Timo Sigurdsson <public_tim...@silentcreek.de> > > diff --git a/arch/arm/configs/multi_v7_defconfig > b/arch/arm/configs/multi_v7_defconfig > index 69a22fd..f712ea3 100644 > --- a/arch/arm/configs/multi_v7_defconfig > +++ b/arch/arm/configs/multi_v7_defconfig (...) > @@ -450,8 +431,7 @@ CONFIG_MEDIA_CAMERA_SUPPORT=y > CONFIG_MEDIA_CONTROLLER=y > CONFIG_VIDEO_V4L2_SUBDEV_API=y > CONFIG_MEDIA_USB_SUPPORT=y > -CONFIG_USB_VIDEO_CLASS=y > -CONFIG_USB_GSPCA=y > +CONFIG_USB_VIDEO_CLASS=m > CONFIG_V4L_PLATFORM_DRIVERS=y > CONFIG_SOC_CAMERA=m > CONFIG_SOC_CAMERA_PLATFORM=m > @@ -465,28 +445,25 @@ CONFIG_DRM=y > CONFIG_DRM_I2C_ADV7511=m > # CONFIG_DRM_I2C_CH7006 is not set > # CONFIG_DRM_I2C_SIL164 is not set > -CONFIG_DRM_NXP_PTN3460=m > -CONFIG_DRM_PARADE_PS8622=m > CONFIG_DRM_NOUVEAU=m > CONFIG_DRM_EXYNOS=m > -CONFIG_DRM_EXYNOS_DSI=y > CONFIG_DRM_EXYNOS_FIMD=y > -CONFIG_DRM_EXYNOS_HDMI=y I would prefer leaving the EXYNOS_HDMI. Dependencies are now not enabled but we are fixing it in: http://www.spinics.net/lists/dri-devel/msg93299.html Best regards, Krzysztof > +CONFIG_DRM_EXYNOS_DSI=y > CONFIG_DRM_ROCKCHIP=m > CONFIG_ROCKCHIP_DW_HDMI=m > CONFIG_DRM_RCAR_DU=m > CONFIG_DRM_RCAR_HDMI=y > CONFIG_DRM_RCAR_LVDS=y > CONFIG_DRM_TEGRA=y > -CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m > CONFIG_DRM_PANEL_SIMPLE=y > +CONFIG_DRM_PANEL_SAMSUNG_S6E8AA0=m > +CONFIG_DRM_NXP_PTN3460=m > +CONFIG_DRM_PARADE_PS8622=m > CONFIG_FB_ARMCLCD=y > CONFIG_FB_WM8505=y > CONFIG_FB_SH_MOBILE_LCDC=y > CONFIG_FB_SIMPLE=y > CONFIG_FB_SH_MOBILE_MERAM=y > -CONFIG_BACKLIGHT_LCD_SUPPORT=y > -CONFIG_BACKLIGHT_CLASS_DEVICE=y > CONFIG_LCD_PLATFORM=m > CONFIG_BACKLIGHT_PWM=y > CONFIG_BACKLIGHT_AS3711=y -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/