From 18f2ddb1aa6413c2423b427161d34ab16a672705 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 19 Feb 2009 11:24:06 -0800
Subject: [PATCH] --- yaml --- r: 141419 b: refs/heads/master c:
 6fadb98d3d370ffb98648ab5b66ead2a3af4d1c8 h: refs/heads/master i:   141417:
 7c439ecb9e47944b7348426d5e431f565d0ce785   141415:
 a2fe66c07243e17ba62332c272af5a1c6e7ff7c9 v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/staging/comedi/drivers/jr3_pci.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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
 };