Add "maru virtio touchscreen" to build.
authorSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 8 Jan 2014 05:04:48 +0000 (14:04 +0900)
committerSeokYeon Hwang <syeon.hwang@samsung.com>
Wed, 9 Apr 2014 05:42:05 +0000 (14:42 +0900)
Change-Id: I133b224afdabc8d11de086ad19c1615bf1e719d5
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
arch/x86/configs/i386_tizen_emul_defconfig
drivers/maru/Kconfig
drivers/maru/Makefile

index 0e8fffb1764ca3b1e12d96145d7d7aea562d17a5..079027ee2331734a0561b12fd8d722cdf04bbe5c 100644 (file)
@@ -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
index 5d12cd19338b77b2916c0417a0ce04ed37e20152..528cd38f84ae35420a48b56e61256c3eea6e825d 100644 (file)
@@ -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
+
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..5d4bc4059dbd881b108b8b97756e863f893859d1 100644 (file)
@@ -0,0 +1 @@
+obj-$(CONFIG_MARU_VIRTIO_TOUCHSCREEN) += maru_virtio_touchscreen.o