diff --git a/[refs] b/[refs]
index b2bf44b67694..a12ab42447ee 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 76728a93a70f23c6376c728e337fb26473737e7f
+refs/heads/master: 55232eca66c540cbef9b950e71b358137651955b
diff --git a/trunk/drivers/staging/comedi/comedi_compat32.h b/trunk/drivers/staging/comedi/comedi_compat32.h
index 0340a8949c6b..c99573be046a 100644
--- a/trunk/drivers/staging/comedi/comedi_compat32.h
+++ b/trunk/drivers/staging/comedi/comedi_compat32.h
@@ -37,7 +37,7 @@ extern long comedi_compat_ioctl(struct file *file, unsigned int cmd,
 
 #else /* CONFIG_COMPAT */
 
-#define comedi_compat_ioctl 0	/* NULL */
+#define comedi_compat_ioctl	NULL
 
 #endif /* CONFIG_COMPAT */