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

This project is archived. Its data is read-only.

Commit 6dcf6ab4 authored Apr 15, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Apr 15, 2014

Merge "defconfig: fsm9900: regenerate file to be in sync with defaults"

parents c51a3295 1e0c111a

arch/arm/configs/fsm9900-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -42,7 +42,6 @@ CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y
		CONFIG_CPU_HAS_L2_PMU=y
		CONFIG_MSM_PCIE=y
		CONFIG_MSM_DIRECT_SCLK_ACCESS=y
		CONFIG_MSM_DLOAD_MODE=y
		CONFIG_MSM_CACHE_ERP=y
		CONFIG_MSM_L1_ERR_PANIC=y
		CONFIG_MSM_L1_RECOV_ERR_PANIC=y
		@@ -205,6 +204,7 @@ CONFIG_GPIO_QPNP_PIN_DEBUG=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_MSM=y
		CONFIG_MSM_DLOAD_MODE=y
		CONFIG_SENSORS_EPM_ADC=y
		CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
		CONFIG_SENSORS_QPNP_ADC_CURRENT=y

arch/arm/configs/fsm9900_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,6 @@ CONFIG_MSM_KRAIT_TBB_ABORT_HANDLER=y
		CONFIG_CPU_HAS_L2_PMU=y
		CONFIG_MSM_PCIE=y
		CONFIG_MSM_DIRECT_SCLK_ACCESS=y
		CONFIG_MSM_DLOAD_MODE=y
		CONFIG_MSM_CACHE_ERP=y
		CONFIG_MSM_L1_ERR_PANIC=y
		CONFIG_MSM_L1_RECOV_ERR_PANIC=y
		@@ -205,6 +204,7 @@ CONFIG_GPIO_QPNP_PIN_DEBUG=y
		CONFIG_POWER_SUPPLY=y
		CONFIG_POWER_RESET=y
		CONFIG_POWER_RESET_MSM=y
		CONFIG_MSM_DLOAD_MODE=y
		CONFIG_SENSORS_EPM_ADC=y
		CONFIG_SENSORS_QPNP_ADC_VOLTAGE=y
		CONFIG_SENSORS_QPNP_ADC_CURRENT=y