Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3779fd6b authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: enable drm and backlight driver for skunk target" into msm-4.8

parents 26970bf6 b4361d0e

arch/arm64/configs/msmskunk-perf_defconfig

+4 −5
Original line number Diff line number Diff line
@@ -258,7 +258,6 @@ CONFIG_POWER_RESET_QCOM=y 
CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y
@@ -269,8 +268,10 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_FB=y

CONFIG_FB_ARMCLCD=y

CONFIG_DRM=y

CONFIG_FB_VIRTUAL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -335,7 +336,6 @@ CONFIG_IOMMU_DEBUG=y 
CONFIG_IOMMU_TESTS=y

CONFIG_QCOM_LLCC=y

CONFIG_QCOM_MSMSKUNK_LLCC=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_EUD=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_MEMORY_DUMP_V2=y
@@ -369,7 +369,6 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_ECRYPT_FS=y

CONFIG_ECRYPT_FS_MESSAGING=y

arch/arm64/configs/msmskunk_defconfig

+3 −4
Original line number Diff line number Diff line
@@ -265,7 +265,6 @@ CONFIG_POWER_RESET_QCOM=y 
CONFIG_POWER_RESET_XGENE=y

CONFIG_POWER_RESET_SYSCON=y

CONFIG_MFD_SPMI_PMIC=y

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_REGULATOR_RPMH=y

CONFIG_REGULATOR_STUB=y
@@ -276,8 +275,10 @@ CONFIG_VIDEO_V4L2_SUBDEV_API=y 
CONFIG_VIDEO_ADV_DEBUG=y

CONFIG_VIDEO_FIXED_MINOR_RANGES=y

CONFIG_V4L_PLATFORM_DRIVERS=y

CONFIG_FB=y

CONFIG_DRM=y

CONFIG_FB_VIRTUAL=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set

# CONFIG_LOGO_LINUX_VGA16 is not set
@@ -346,7 +347,6 @@ CONFIG_IOMMU_DEBUG=y 
CONFIG_IOMMU_TESTS=y

CONFIG_QCOM_LLCC=y

CONFIG_QCOM_MSMSKUNK_LLCC=y

CONFIG_QCOM_SCM=y

CONFIG_QCOM_EUD=y

CONFIG_QCOM_WATCHDOG_V2=y

CONFIG_QCOM_MEMORY_DUMP_V2=y
@@ -381,7 +381,6 @@ CONFIG_EXT4_FS_SECURITY=y 
CONFIG_FUSE_FS=y

CONFIG_MSDOS_FS=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_TMPFS_POSIX_ACL=y

CONFIG_EFIVAR_FS=y

CONFIG_ECRYPT_FS=y