diff --git a/[refs] b/[refs]
index c2a75417adbe..7a1aec8a5357 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ab64f663412716193ccafefd7e6cc27dcf691ac8
+refs/heads/master: 4a5a33b622ca46acd0a7c593a804964353d54a7b
diff --git a/trunk/drivers/staging/comedi/interrupt.h b/trunk/drivers/staging/comedi/interrupt.h
index 50cf823dbd04..d1f09892da2e 100644
--- a/trunk/drivers/staging/comedi/interrupt.h
+++ b/trunk/drivers/staging/comedi/interrupt.h
@@ -21,13 +21,6 @@
 
 #include <linux/interrupt.h>
 
-#ifndef IRQ_NONE
-typedef void irqreturn_t;
-#define IRQ_NONE
-#define IRQ_HANDLED
-#define IRQ_RETVAL(x) (void)(x)
-#endif
-
 #ifndef IRQF_DISABLED
 #define IRQF_DISABLED           SA_INTERRUPT
 #define IRQF_SAMPLE_RANDOM      SA_SAMPLE_RANDOM