diff --git a/[refs] b/[refs]
index 626dd5b1b131..6c6b3a7e8e17 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9afbebe411a0f96e069c994057d83422147f5c0d
+refs/heads/master: 6fadb98d3d370ffb98648ab5b66ead2a3af4d1c8
diff --git a/trunk/drivers/staging/comedi/drivers/jr3_pci.c b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
index f58b8f1440b2..3ba05d9c7176 100644
--- a/trunk/drivers/staging/comedi/drivers/jr3_pci.c
+++ b/trunk/drivers/staging/comedi/drivers/jr3_pci.c
@@ -56,7 +56,7 @@ static void comedi_fw_release(struct device *dev)
 }
 
 static struct device comedi_fw_device = {
-	.bus_id = "comedi",
+	.init_name = "comedi",
 	.release = comedi_fw_release
 };