From c33cc3bc9d189dacf9a14685aeaf151b748a5c23 Mon Sep 17 00:00:00 2001 From: Andrey Konovalov Date: Wed, 22 May 2013 17:27:09 +0400 Subject: PINNED manifest and solutions for lsk-20130522.0 Signed-off-by: Andrey Konovalov --- .../9c565655cf758901ae9034e970320b1b/conflict1 | 32 ++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 solutions/9c565655cf758901ae9034e970320b1b/conflict1 (limited to 'solutions/9c565655cf758901ae9034e970320b1b/conflict1') diff --git a/solutions/9c565655cf758901ae9034e970320b1b/conflict1 b/solutions/9c565655cf758901ae9034e970320b1b/conflict1 new file mode 100644 index 0000000..158ce91 --- /dev/null +++ b/solutions/9c565655cf758901ae9034e970320b1b/conflict1 @@ -0,0 +1,32 @@ +diff --cc arch/arm/Kconfig +index b67e45a,74538c6..0000000 +--- a/arch/arm/Kconfig ++++ b/arch/arm/Kconfig +@@@ -1706,6 -1614,24 +1706,27 @@@ config BIG_LITTL + help + This option enables support for the big.LITTLE architecture. + +++<<<<<<< HEAD +++======= ++ config BL_SWITCHER ++ bool "big.LITTLE switcher support" ++ depends on BIG_LITTLE && MCPM && HOTPLUG_CPU ++ select CPU_PM ++ select ARM_CPU_SUSPEND ++ help ++ The big.LITTLE "switcher" provides the core functionality to ++ transparently handle transition between a cluster of A15's ++ and a cluster of A7's in a big.LITTLE system. ++ ++ config BL_SWITCHER_DUMMY_IF ++ tristate "Simple big.LITTLE switcher user interface" ++ depends on BL_SWITCHER && DEBUG_KERNEL ++ help ++ This is a simple and dummy char dev interface to control ++ the big.LITTLE switcher core code. It is meant for ++ debugging purposes only. ++ +++>>>>>>> tracking-iks + choice + prompt "Memory split" + default VMSPLIT_3G -- cgit v1.2.3