diff --git a/drivers/misc/abov/Kbuild b/drivers/misc/abov/Kbuild
index 647620de18f5..84959597c531 100644
--- a/drivers/misc/abov/Kbuild
+++ b/drivers/misc/abov/Kbuild
@@ -1,7 +1,15 @@
 # add -Wall to try to catch everything we can.
+KERNEL_DIR_PATH = $(shell find $(TOP)/kernel/ -name "msm-*" | head -1 | grep -i "kernel/msm-*")
+
+KERNEL_VERSION_NAME = $(shell basename $(KERNEL_DIR_PATH))
 EXTRA_CFLAGS += -Wall
 EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
 
+ifneq (,$(KERNEL_DIR_PATH))
+        EXTRA_CFLAGS += -I$(TOP)/kernel/$(KERNEL_VERSION_NAME)/drivers/base
+else
+        EXTRA_CFLAGS += -I$(TOP)/kernel/drivers/base
+endif
 KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../sensors/Module.symvers
 
 abov_sar-y := abov_sar_mmi.o
diff --git a/drivers/misc/abov/abov_sar_mmi.c b/drivers/misc/abov/abov_sar_mmi.c
index bc4a3a85041d..49c46359297a 100644
--- a/drivers/misc/abov/abov_sar_mmi.c
+++ b/drivers/misc/abov/abov_sar_mmi.c
@@ -40,6 +40,7 @@
 #include <asm/atomic.h>
 #include <linux/async.h>
 #include <linux/firmware.h>
+#include "base.h"
 #define SLEEP(x)	mdelay(x)
 
 #define C_I2C_FIFO_SIZE 8
@@ -1707,6 +1708,9 @@ static int abov_probe(struct i2c_client *client, const struct i2c_device_id *id)
 			goto err_class_register;
 		}
 
+		/*restore sys/class/capsense label*/
+		kobject_uevent(&capsense_class.p->subsys.kobj, KOBJ_CHANGE);
+
 #ifdef USE_SENSORS_CLASS
 		sensors_capsensor_top_cdev.sensors_enable = capsensor_set_enable;
 		sensors_capsensor_top_cdev.sensors_poll_delay = NULL;
diff --git a/drivers/misc/abov_a96t/Kbuild b/drivers/misc/abov_a96t/Kbuild
index 01299503f0c2..c01e49fd6065 100644
--- a/drivers/misc/abov_a96t/Kbuild
+++ b/drivers/misc/abov_a96t/Kbuild
@@ -1,5 +1,14 @@
 # add -Wall to try to catch everything we can.
+KERNEL_DIR_PATH = $(shell find $(TOP)/kernel/ -name "msm-*" | head -1 | grep -i "kernel/msm-*")
+
+KERNEL_VERSION_NAME = $(shell basename $(KERNEL_DIR_PATH))
 EXTRA_CFLAGS += -Wall
 EXTRA_CFLAGS += -I$(TOP)/motorola/kernel/modules/include
 
+ifneq (,$(KERNEL_DIR_PATH))
+        EXTRA_CFLAGS += -I$(TOP)/kernel/$(KERNEL_VERSION_NAME)/drivers/base
+else
+        EXTRA_CFLAGS += -I$(TOP)/kernel/drivers/base
+endif
+KBUILD_EXTRA_SYMBOLS += $(CURDIR)/$(KBUILD_EXTMOD)/../../sensors/Module.symvers
 obj-m = abov_sar_a96t.o
diff --git a/drivers/misc/abov_a96t/abov_sar_a96t.c b/drivers/misc/abov_a96t/abov_sar_a96t.c
index bb8fd23ef589..879523e8c369 100644
--- a/drivers/misc/abov_a96t/abov_sar_a96t.c
+++ b/drivers/misc/abov_a96t/abov_sar_a96t.c
@@ -36,6 +36,8 @@
 #include <linux/async.h>
 #include <linux/firmware.h>
 #include <linux/version.h>
+#include "base.h"
+
 #define SLEEP(x)	mdelay(x)
 
 #define C_I2C_FIFO_SIZE 8
@@ -1572,6 +1574,9 @@ static int abov_probe(struct i2c_client *client, const struct i2c_device_id *id)
 			LOG_DBG("Create update_fw file failed (%d)\n", ret);
 			return ret;
 		}
+		/*restore sys/class/capsense label*/
+		kobject_uevent(&capsense_class.p->subsys.kobj, KOBJ_CHANGE);
+
 #ifdef USE_SENSORS_CLASS
 		sensors_capsensor_top_cdev.sensors_enable = capsensor_set_enable;
 		sensors_capsensor_top_cdev.sensors_poll_delay = NULL;