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

Commit 9c9031be authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "defconfig: msm: enable fbdev support for APQ8009"

parents 2ec18ec7 00564993

arch/arm/configs/msm8909-perf_defconfig

+6 −1
Original line number Diff line number Diff line
@@ -331,6 +331,11 @@ CONFIG_MSM_ISP_V1=y 
CONFIG_MSM_ISPIF=y

CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS=y

CONFIG_FB_MSM_MDSS_MDP3=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_SOUND=y
@@ -382,7 +387,6 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_QCOM_SPS_DMA=y

CONFIG_SYNC_FILE=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y
@@ -394,6 +398,7 @@ CONFIG_SPS=y 
CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_REVID=y

CONFIG_USB_BAM=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y

arch/arm/configs/msm8909_defconfig

100755 → 100644
+6 −1
Original line number Diff line number Diff line
@@ -355,6 +355,11 @@ CONFIG_MSM_ISPIF=y 
CONFIG_QCOM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_FB_MSM=y

CONFIG_FB_MSM_MDSS=y

CONFIG_FB_MSM_MDSS_DSI_CTRL_STATUS=y

CONFIG_FB_MSM_MDSS_MDP3=y

CONFIG_FB_MSM_MDSS_XLOG_DEBUG=y

CONFIG_BACKLIGHT_LCD_SUPPORT=y

CONFIG_BACKLIGHT_CLASS_DEVICE=y

CONFIG_LOGO=y
@@ -422,7 +427,6 @@ CONFIG_RTC_CLASS=y 
CONFIG_RTC_DRV_QPNP=y

CONFIG_DMADEVICES=y

CONFIG_QCOM_SPS_DMA=y

CONFIG_SYNC_FILE=y

CONFIG_UIO=y

CONFIG_UIO_MSM_SHAREDMEM=y

CONFIG_STAGING=y
@@ -436,6 +440,7 @@ CONFIG_SPS=y 
CONFIG_SPS_SUPPORT_NDP_BAM=y

CONFIG_QPNP_REVID=y

CONFIG_USB_BAM=y

CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MAILBOX=y

CONFIG_ARM_SMMU=y