diff --git a/[refs] b/[refs]
index 7ca043b3b81a..1128b0723d9f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6749ffa84028b5283889eb68b9bbec2e27049722
+refs/heads/master: 6e4733c34fd344fe17c7f6f8bd340d116f5377ec
diff --git a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
index 669894c2a7cb..6c6ca40b91f8 100644
--- a/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
+++ b/trunk/drivers/staging/comedi/drivers/ni_labpc_cs.c
@@ -108,13 +108,9 @@ static const struct labpc_board_struct labpc_cs_boards[] = {
 	 },
 };
 
-/*
- * Useful for shorthand access to the particular board structure
- */
-#define thisboard ((const struct labpc_board_struct *)dev->board_ptr)
-
 static int labpc_attach(struct comedi_device *dev, struct comedi_devconfig *it)
 {
+	const struct labpc_board_struct *thisboard = comedi_board(dev);
 	struct labpc_private *devpriv;
 	unsigned long iobase = 0;
 	unsigned int irq = 0;