diff --git a/[refs] b/[refs]
index dfabff1791aa..17701a1ae334 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 135f8a5e031db8ef4031fb3c815ef7ace876f9b1
+refs/heads/master: 2ca9bc2e69b66f98ff41c06700333cb544f91211
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
index 93f94cd7bae2..4b7cfe342c79 100644
--- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
@@ -362,7 +362,8 @@ static int jr3_pci_open(struct comedi_device *dev)
 	return 0;
 }
 
-int read_idm_word(const u8 * data, size_t size, int *pos, unsigned int *val)
+static int read_idm_word(const u8 *data, size_t size, int *pos,
+			 unsigned int *val)
 {
 	int result = 0;
 	if (pos != 0 && val != 0) {