Merge android-4.4.191 (6da3fbc) into msm-4.4

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / staging / android / Makefile

diff --git a/drivers/staging/android/Makefile b/drivers/staging/android/Makefile
index 0878866..a4e9c01 100644 (file)
--- a/drivers/staging/android/Makefile
+++ b/drivers/staging/android/Makefile
@@ -1,7 +1,6 @@
 ccflags-y += -I$(src)                  # needed for trace events
 
 obj-y                                  += ion/
-obj-$(CONFIG_FIQ_DEBUGGER)             += fiq_debugger/
 
 obj-$(CONFIG_ASHMEM)                   += ashmem.o
 obj-$(CONFIG_ANDROID_TIMED_OUTPUT)     += timed_output.o
@@ -9,4 +8,5 @@ obj-$(CONFIG_ANDROID_TIMED_GPIO)        += timed_gpio.o
 obj-$(CONFIG_ANDROID_LOW_MEMORY_KILLER)        += lowmemorykiller.o
 obj-$(CONFIG_SYNC)                     += sync.o sync_debug.o
 obj-$(CONFIG_SW_SYNC)                  += sw_sync.o
+obj-$(CONFIG_ONESHOT_SYNC)             += oneshot_sync.o
 obj-$(CONFIG_ANDROID_VSOC)             += vsoc.o