diff --git a/[refs] b/[refs]
index 2399073b01ec..d759785d5f76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e53b9d6d8b4cad51dd9e52c1d7ed549faab1d091
+refs/heads/master: f2f8486e7a215705c18eb07ce6cecb7b32a29eba
diff --git a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h
index 2451a942a9a1..6d8b29f945d5 100644
--- a/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h
+++ b/trunk/drivers/staging/comedi/drivers/addi-data/addi_common.h
@@ -18,9 +18,6 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 
-#define ERROR	-1
-#define SUCCESS	1
-
 #define LOBYTE(W)	(unsigned char)((W) & 0xFF)
 #define HIBYTE(W)	(unsigned char)(((W) >> 8) & 0xFF)
 #define MAKEWORD(H, L)	(unsigned short)((L) | ((H) << 8))