diff --git a/[refs] b/[refs]
index 5d71edde3d2f..d6cc0ec7c3e6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: deb02fc574909973786ec6e5ac4b5bced683a2e2
+refs/heads/master: da1d8b68af7ccf0ed1eae587c57c5ef62a63a591
diff --git a/trunk/drivers/staging/iio/light/light.h b/trunk/drivers/staging/iio/light/light.h
index e4e1e2c4139c..83286581f8f0 100644
--- a/trunk/drivers/staging/iio/light/light.h
+++ b/trunk/drivers/staging/iio/light/light.h
@@ -2,6 +2,4 @@
 
 /* Light to digital sensor attributes */
 
-#define IIO_EVENT_CODE_LIGHT_THRESH IIO_EVENT_CODE_LIGHT_BASE
-
 
diff --git a/trunk/drivers/staging/iio/light/tsl2563.c b/trunk/drivers/staging/iio/light/tsl2563.c
index 98f8b78f5d8c..98149e136a26 100644
--- a/trunk/drivers/staging/iio/light/tsl2563.c
+++ b/trunk/drivers/staging/iio/light/tsl2563.c
@@ -706,8 +706,11 @@ static void tsl2563_int_bh(struct work_struct *work_s)
 	u8 cmd = TSL2563_CMD | TSL2563_CLEARINT;
 
 	iio_push_event(chip->indio_dev, 0,
-		IIO_EVENT_CODE_LIGHT_BASE,
-		chip->event_timestamp);
+		       IIO_UNMOD_EVENT_CODE(IIO_EV_CLASS_LIGHT,
+					    0,
+					    IIO_EV_TYPE_THRESH,
+					    IIO_EV_DIR_EITHER),
+		       chip->event_timestamp);
 
 	/* reenable_irq */
 	enable_irq(chip->client->irq);
diff --git a/trunk/drivers/staging/iio/sysfs.h b/trunk/drivers/staging/iio/sysfs.h
index 206400921ee5..116dacf51d1a 100644
--- a/trunk/drivers/staging/iio/sysfs.h
+++ b/trunk/drivers/staging/iio/sysfs.h
@@ -294,7 +294,6 @@ struct iio_const_attr {
 #define IIO_EVENT_CODE_ACCEL_BASE	300
 #define IIO_EVENT_CODE_GYRO_BASE	400
 #define IIO_EVENT_CODE_MISC_BASE	600
-#define IIO_EVENT_CODE_LIGHT_BASE	700
 
 #define IIO_EVENT_CODE_DEVICE_SPECIFIC	1000