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

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

Merge "defconfig: arm: msm: Enable MSM_KGSL config flag"

parents 7c12f842 972a0796

arch/arm/configs/msm8937-perf_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -352,6 +352,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_RADIO_SILABS=y

CONFIG_MSM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_FB_MSM=y
@@ -431,7 +432,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y 
CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ONESHOT_SYNC=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_AVTIMER=y

arch/arm/configs/msm8937_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -343,6 +343,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_RADIO_SILABS=y

CONFIG_MSM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_FB_MSM=y
@@ -427,7 +428,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y 
CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ONESHOT_SYNC=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_AVTIMER=y

arch/arm/configs/msmcortex-perf_defconfig

+2 −2
Original line number Diff line number Diff line
@@ -252,9 +252,9 @@ CONFIG_USB_USBNET=y 
CONFIG_WCNSS_CORE=y

CONFIG_WCNSS_CORE_PRONTO=y

CONFIG_WCNSS_REGISTER_DUMP_ON_BITE=y

CONFIG_CLD_LL_CORE=y

CONFIG_WCNSS_MEM_PRE_ALLOC=y

CONFIG_ATH_CARDS=y

CONFIG_CLD_LL_CORE=y

CONFIG_INPUT_EVDEV=y

CONFIG_INPUT_EVBUG=m

CONFIG_INPUT_KEYRESET=y
@@ -342,6 +342,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_RADIO_SILABS=y

CONFIG_MSM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_FB_MSM=y
@@ -421,7 +422,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y 
CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ONESHOT_SYNC=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_AVTIMER=y

arch/arm/configs/msmcortex_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -331,6 +331,7 @@ CONFIG_V4L_PLATFORM_DRIVERS=y 
CONFIG_SOC_CAMERA=y

CONFIG_SOC_CAMERA_PLATFORM=y

CONFIG_RADIO_SILABS=y

CONFIG_MSM_KGSL=y

CONFIG_FB=y

CONFIG_FB_VIRTUAL=y

CONFIG_FB_MSM=y
@@ -418,7 +419,6 @@ CONFIG_ANDROID_LOW_MEMORY_KILLER=y 
CONFIG_SYNC=y

CONFIG_SW_SYNC=y

CONFIG_SW_SYNC_USER=y

CONFIG_ONESHOT_SYNC=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_MSM_AVTIMER=y