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

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

Merge "defconfig: 8916: Re-enable forced 4K allocation/mapping"

parents 8f3570e1 74145190

arch/arm/configs/msm8916-perf_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -402,6 +402,7 @@ CONFIG_ANDROID_INTF_ALARM_DEV=y 
CONFIG_ONESHOT_SYNC=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_ALLOC_BUFFERS_IN_4K_CHUNKS=y

CONFIG_SPS=y

CONFIG_USB_BAM=y

CONFIG_SPS_SUPPORT_NDP_BAM=y
@@ -411,6 +412,7 @@ CONFIG_QPNP_REVID=y 
CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU_V1=y

CONFIG_IOMMU_FORCE_4K_MAPPINGS=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_MOBICORE_SUPPORT=m

arch/arm/configs/msm8916_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ CONFIG_ANDROID_INTF_ALARM_DEV=y 
CONFIG_ONESHOT_SYNC=y

CONFIG_ION=y

CONFIG_ION_MSM=y

CONFIG_ALLOC_BUFFERS_IN_4K_CHUNKS=y

CONFIG_SPS=y

CONFIG_USB_BAM=y

CONFIG_SPS_SUPPORT_NDP_BAM=y
@@ -410,6 +411,7 @@ CONFIG_QPNP_REVID=y 
CONFIG_MSM_MDSS_PLL=y

CONFIG_REMOTE_SPINLOCK_MSM=y

CONFIG_MSM_IOMMU_V1=y

CONFIG_IOMMU_FORCE_4K_MAPPINGS=y

CONFIG_PWM=y

CONFIG_PWM_QPNP=y

CONFIG_MOBICORE_SUPPORT=m