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

Commit 6014bb19 authored Sep 07, 2014 by Linux Build Service Account Committed by Gerrit - the friendly Code Review server Sep 07, 2014

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

parents 1afb510d 90cc3dda

arch/arm/configs/fsm9900-perf_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -29,6 +29,7 @@ CONFIG_EMBEDDED=y
		CONFIG_PROFILING=y
		CONFIG_OPROFILE=m
		CONFIG_KPROBES=y
		CONFIG_CC_STACKPROTECTOR_REGULAR=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		CONFIG_MODULE_FORCE_UNLOAD=y
		@@ -62,7 +63,6 @@ CONFIG_SCHED_MC=y
		CONFIG_PREEMPT=y
		CONFIG_AEABI=y
		CONFIG_HIGHMEM=y
		CONFIG_CC_STACKPROTECTOR_REGULAR=y
		CONFIG_CP_ACCESS=y
		CONFIG_CPU_FREQ=y
		CONFIG_CPU_FREQ_GOV_POWERSAVE=y

arch/arm/configs/fsm9900_defconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -28,6 +28,7 @@ CONFIG_EMBEDDED=y
		CONFIG_PROFILING=y
		CONFIG_OPROFILE=m
		CONFIG_KPROBES=y
		CONFIG_CC_STACKPROTECTOR_REGULAR=y
		CONFIG_MODULES=y
		CONFIG_MODULE_UNLOAD=y
		CONFIG_MODULE_FORCE_UNLOAD=y
		@@ -61,7 +62,6 @@ CONFIG_SCHED_MC=y
		CONFIG_PREEMPT=y
		CONFIG_AEABI=y
		CONFIG_HIGHMEM=y
		CONFIG_CC_STACKPROTECTOR_REGULAR=y
		CONFIG_CP_ACCESS=y
		CONFIG_CPU_FREQ=y
		CONFIG_CPU_FREQ_GOV_POWERSAVE=y