diff --git a/[refs] b/[refs]
index 2f18b55b6c39..33971e275d3d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 742363243875a1969124909d2e81f23ae287915f
+refs/heads/master: 5c7bfad82364090fa9dbd831662bdf05ee7e36df
diff --git a/trunk/drivers/staging/comedi/drivers/rti800.c b/trunk/drivers/staging/comedi/drivers/rti800.c
index b9cf74c1f74c..dc81132e7d0c 100644
--- a/trunk/drivers/staging/comedi/drivers/rti800.c
+++ b/trunk/drivers/staging/comedi/drivers/rti800.c
@@ -125,11 +125,20 @@ static const struct comedi_lrange range_rti800_ai_unipolar = {
 };
 
 struct rti800_board {
-
 	const char *name;
 	int has_ao;
 };
 
+static const struct rti800_board rti800_boardtypes[] = {
+	{
+		.name		= "rti800",
+		.has_ao		= 0,
+	}, {
+		.name		= "rti815",
+		.has_ao		= 1,
+	},
+};
+
 struct rti800_private {
 	enum {
 		adc_diff, adc_pseudodiff, adc_singleended
@@ -438,18 +447,13 @@ static void rti800_detach(struct comedi_device *dev)
 		free_irq(dev->irq, dev);
 }
 
-static const struct rti800_board boardtypes[] = {
-	{ "rti800", 0 },
-	{ "rti815", 1 },
-};
-
 static struct comedi_driver rti800_driver = {
 	.driver_name	= "rti800",
 	.module		= THIS_MODULE,
 	.attach		= rti800_attach,
 	.detach		= rti800_detach,
-	.num_names	= ARRAY_SIZE(boardtypes),
-	.board_name	= &boardtypes[0].name,
+	.num_names	= ARRAY_SIZE(rti800_boardtypes),
+	.board_name	= &rti800_boardtypes[0].name,
 	.offset		= sizeof(struct rti800_board),
 };
 module_comedi_driver(rti800_driver);