diff --git a/[refs] b/[refs]
index 3e9814f2107c..53084077cfb7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 46ca84c4659f24776f7b901dd6054e3c6dfc115e
+refs/heads/master: 4dba6c02cd2bd4714db4f0ccd3ebc3983ff0e039
diff --git a/trunk/drivers/staging/comedi/comedidev.h b/trunk/drivers/staging/comedi/comedidev.h
index 4ac2de43cdbb..5af3579337eb 100644
--- a/trunk/drivers/staging/comedi/comedidev.h
+++ b/trunk/drivers/staging/comedi/comedidev.h
@@ -247,7 +247,7 @@ struct comedi_device {
 	void (*close) (struct comedi_device *dev);
 };
 
-static inline const void *comedi_board(struct comedi_device *dev)
+static inline const void *comedi_board(const struct comedi_device *dev)
 {
 	return dev->board_ptr;
 }