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

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

Merge "Merge google common 'android-3.18' into 'msm-3.18'"

parents bbc27548 973c3ed7

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION = 3

PATCHLEVEL = 18

SUBLEVEL = 91

SUBLEVEL = 94

EXTRAVERSION =

NAME = Diseased Newt

arch/arm/boot/dts/kirkwood-openblocks_a7.dts

+8 −2
Original line number Diff line number Diff line
@@ -53,7 +53,8 @@ 
		};



		pinctrl: pin-controller@10000 {

			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header>;

			pinctrl-0 = <&pmx_dip_switches &pmx_gpio_header

				     &pmx_gpio_header_gpo>;

			pinctrl-names = "default";



			pmx_uart0: pmx-uart0 {
@@ -85,11 +86,16 @@ 
			 * ground.

			 */

			pmx_gpio_header: pmx-gpio-header {

				marvell,pins = "mpp17", "mpp7", "mpp29", "mpp28",

				marvell,pins = "mpp17", "mpp29", "mpp28",

					       "mpp35", "mpp34", "mpp40";

				marvell,function = "gpio";

			};



			pmx_gpio_header_gpo: pxm-gpio-header-gpo {

				marvell,pins = "mpp7";

				marvell,function = "gpo";

			};



			pmx_gpio_init: pmx-init {

				marvell,pins = "mpp38";

				marvell,function = "gpio";

arch/arm/configs/apq8053_IoE-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -4,6 +4,9 @@ CONFIG_AUDIT=y 
CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IRQ_TIME_ACCOUNTING=y

CONFIG_TASKSTATS=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_RCU_NOCB_CPU=y

CONFIG_RCU_NOCB_CPU_ALL=y

arch/arm/configs/msm8909w-perf_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ CONFIG_EARLY_IOREMAP=y 
CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_TASKSTATS=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

arch/arm/configs/msm8909w_defconfig

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,9 @@ CONFIG_EARLY_IOREMAP=y 
CONFIG_AUDIT=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_TASKSTATS=y

CONFIG_TASK_XACCT=y

CONFIG_TASK_IO_ACCOUNTING=y

CONFIG_RCU_FAST_NO_HZ=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y