From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Wed, 8 Jan 2014 05:04:48 +0000 (+0900)
Subject: Add "maru virtio touchscreen" to build.
X-Git-Tag: submit/tizen_common/20140905.094502~221
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=481eb03ae52e50ed99aa0b5e0c5a5c1dd0bb58bc;p=sdk%2Femulator%2Femulator-kernel.git

Add "maru virtio touchscreen" to build.

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

diff --git a/arch/x86/configs/i386_tizen_emul_defconfig b/arch/x86/configs/i386_tizen_emul_defconfig
index 0e8fffb1764c..079027ee2331 100644
--- a/arch/x86/configs/i386_tizen_emul_defconfig
+++ b/arch/x86/configs/i386_tizen_emul_defconfig
@@ -2808,7 +2808,7 @@ CONFIG_IOMMU_SUPPORT=y
 # CONFIG_IPACK_BUS is not set
 # CONFIG_RESET_CONTROLLER is not set
 CONFIG_MARU=y
-CONFIG_MARU_TOUCHSCREEN=y
+CONFIG_MARU_VIRTIO_TOUCHSCREEN=y
 
 #
 # Firmware Drivers
diff --git a/drivers/maru/Kconfig b/drivers/maru/Kconfig
index 5d12cd19338b..528cd38f84ae 100644
--- a/drivers/maru/Kconfig
+++ b/drivers/maru/Kconfig
@@ -1,3 +1,8 @@
 menuconfig MARU
 	tristate "MARU virtual device drivers for emulator"
 	default n
+
+config MARU_VIRTIO_TOUCHSCREEN
+	tristate "MARU Virtio Touchscreen Driver"
+	depends on MARU != n
+
diff --git a/drivers/maru/Makefile b/drivers/maru/Makefile
index e69de29bb2d1..5d4bc4059dbd 100644
--- a/drivers/maru/Makefile
+++ b/drivers/maru/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_MARU_VIRTIO_TOUCHSCREEN) += maru_virtio_touchscreen.o