summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJinhyung Choi <jinh0.choi@samsung.com>2016-06-12 16:13:16 +0900
committerJinhyung Choi <jinh0.choi@samsung.com>2016-06-12 16:13:16 +0900
commitc17556c4c67c5aaef4935b926a807bdfa969cd40 (patch)
tree56216f5f09ccc1c9fffc1a8259782c653f091185
parentf6e7401bf171540d8f6ffe4d1faa0ab5f6362303 (diff)
downloademulator-kernel-c17556c4c67c5aaef4935b926a807bdfa969cd40.tar.gz
emulator-kernel-c17556c4c67c5aaef4935b926a807bdfa969cd40.tar.bz2
emulator-kernel-c17556c4c67c5aaef4935b926a807bdfa969cd40.zip
config: enable CONFIG_MARU_POWER_SUPPLY
Change-Id: I503d1406b16f7ed9773e60b9afa08f921f49d73c Signed-off-by: Jinhyung Choi <jinh0.choi@samsung.com>
-rw-r--r--arch/x86/configs/tizen_emul_defconfig3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/configs/tizen_emul_defconfig b/arch/x86/configs/tizen_emul_defconfig
index 8aa1c1e0bcac..5427f4b4a20b 100644
--- a/arch/x86/configs/tizen_emul_defconfig
+++ b/arch/x86/configs/tizen_emul_defconfig
@@ -2160,7 +2160,7 @@ CONFIG_PTP_1588_CLOCK=y
CONFIG_ARCH_WANT_OPTIONAL_GPIOLIB=y
# CONFIG_GPIOLIB is not set
# CONFIG_W1 is not set
-CONFIG_POWER_SUPPLY=y
+# CONFIG_POWER_SUPPLY is not set
# CONFIG_POWER_SUPPLY_DEBUG is not set
# CONFIG_PDA_POWER is not set
# CONFIG_TEST_POWER is not set
@@ -3443,6 +3443,7 @@ CONFIG_MARU_VIRTIO_TOUCHSCREEN=y
CONFIG_MARU_CAMERA=y
CONFIG_MARU_BACKLIGHT=y
CONFIG_MARU_JACK=y
+CONFIG_MARU_POWER_SUPPLY=y
CONFIG_MARU_VIRTIO_HWKEY=y
CONFIG_MARU_VIRTIO_TABLET=y
CONFIG_MARU_VIRTIO_KEYBOARD=y