From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Thu, 9 Jun 2016 03:22:59 +0000 (+0900)
Subject: build: enable Android logger and alarm-dev again
X-Git-Tag: accepted/tizen/3.0/common/20161114.112243~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9b353db9cadf533a436bab085003817f2f3d2ad0;p=sdk%2Femulator%2Femulator-kernel.git

build: enable Android logger and alarm-dev again

Change-Id: I367015ced2a8088fff7f595be426c2a5086e0a92
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
---

diff --git a/arch/x86/configs/tizen_emul_defconfig b/arch/x86/configs/tizen_emul_defconfig
index 2592e58..8aa1c1e 100644
--- a/arch/x86/configs/tizen_emul_defconfig
+++ b/arch/x86/configs/tizen_emul_defconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/x86 4.4.8 Kernel Configuration
+# Linux/x86 4.4.12 Kernel Configuration
 #
 # CONFIG_64BIT is not set
 CONFIG_X86_32=y
@@ -822,7 +822,7 @@ CONFIG_BRIDGE_NETFILTER=y
 CONFIG_NETFILTER_INGRESS=y
 CONFIG_NETFILTER_NETLINK=y
 CONFIG_NETFILTER_NETLINK_ACCT=y
-# CONFIG_NETFILTER_NETLINK_QUEUE is not set
+CONFIG_NETFILTER_NETLINK_QUEUE=y
 CONFIG_NETFILTER_NETLINK_LOG=y
 CONFIG_NF_CONNTRACK=y
 # CONFIG_NF_CONNTRACK_MARK is not set
@@ -3306,8 +3306,10 @@ CONFIG_STAGING=y
 # Android
 #
 # CONFIG_ASHMEM is not set
+CONFIG_ANDROID_LOGGER=y
 CONFIG_ANDROID_TIMED_OUTPUT=y
 # CONFIG_ANDROID_LOW_MEMORY_KILLER is not set
+CONFIG_ANDROID_INTF_ALARM_DEV=y
 # CONFIG_SYNC is not set
 # CONFIG_ION is not set
 # CONFIG_WIMAX_GDM72XX is not set