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

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

Merge changes Ie9a31920,Idf61781a into msm-3.10 

* changes:
  defconfig: fsm9900: regenerate file to be in sync with defaults
  defconfig: fsm9900: Enable SFQ net scheduler
parents d17efd4b 555590b7

arch/arm/configs/fsm9900-perf_defconfig

+5 −4
Original line number Diff line number Diff line
@@ -43,10 +43,6 @@ CONFIG_CPU_HAS_L2_PMU=y 
CONFIG_MSM_PCIE=y

CONFIG_MSM_DIRECT_SCLK_ACCESS=y

CONFIG_MSM_DLOAD_MODE=y

CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_OCMEM_NONSECURE=y

CONFIG_MSM_CACHE_ERP=y

CONFIG_MSM_L1_ERR_PANIC=y

CONFIG_MSM_L1_RECOV_ERR_PANIC=y
@@ -131,6 +127,7 @@ CONFIG_BRIDGE=y 
CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_HTB=y

CONFIG_NET_SCH_SFQ=y

CONFIG_NET_CLS_U32=y

CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_U32=y
@@ -260,6 +257,10 @@ CONFIG_MSM_WATCHDOG_V2=y 
CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL_FEMTO=y

CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_OCMEM_NONSECURE=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y

arch/arm/configs/fsm9900_defconfig

+5 −4
Original line number Diff line number Diff line
@@ -42,10 +42,6 @@ CONFIG_CPU_HAS_L2_PMU=y 
CONFIG_MSM_PCIE=y

CONFIG_MSM_DIRECT_SCLK_ACCESS=y

CONFIG_MSM_DLOAD_MODE=y

CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_OCMEM_NONSECURE=y

CONFIG_MSM_CACHE_ERP=y

CONFIG_MSM_L1_ERR_PANIC=y

CONFIG_MSM_L1_RECOV_ERR_PANIC=y
@@ -132,6 +128,7 @@ CONFIG_BRIDGE=y 
CONFIG_VLAN_8021Q=y

CONFIG_NET_SCHED=y

CONFIG_NET_SCH_HTB=y

CONFIG_NET_SCH_SFQ=y

CONFIG_NET_CLS_U32=y

CONFIG_NET_EMATCH=y

CONFIG_NET_EMATCH_U32=y
@@ -260,6 +257,10 @@ CONFIG_MSM_WATCHDOG_V2=y 
CONFIG_MSM_SUBSYSTEM_RESTART=y

CONFIG_MSM_SYSMON_COMM=y

CONFIG_MSM_PIL_FEMTO=y

CONFIG_MSM_OCMEM=y

CONFIG_MSM_OCMEM_LOCAL_POWER_CTRL=y

CONFIG_MSM_OCMEM_DEBUG=y

CONFIG_MSM_OCMEM_NONSECURE=y

CONFIG_EXT2_FS=y

CONFIG_EXT2_FS_XATTR=y

CONFIG_EXT3_FS=y