From 01228e3560fc44ea1abc17e22cd92156025364c9 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Thu, 11 Oct 2007 10:47:49 -0600
Subject: [PATCH] --- yaml --- r: 68003 b: refs/heads/master c:
 a1148fb03f3c5d0bb5e6641234c2251a15741361 h: refs/heads/master i:   68001:
 da26a638d019c3fcd43a0677615e5320fc63b317   67999:
 4ec373f8129b55a5a057a163b2b39598c2cc6e85 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/base/bus.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a878cf0bdd74..f69a2bb2744a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f4afc410b8d2be49f34835b6bbe788f50471b02
+refs/heads/master: a1148fb03f3c5d0bb5e6641234c2251a15741361
diff --git a/trunk/drivers/base/bus.c b/trunk/drivers/base/bus.c
index 6768a01e210b..9a19b071c573 100644
--- a/trunk/drivers/base/bus.c
+++ b/trunk/drivers/base/bus.c
@@ -89,7 +89,7 @@ static void driver_release(struct kobject * kobj)
 	 */
 }
 
-static struct kobj_type ktype_driver = {
+static struct kobj_type driver_ktype = {
 	.sysfs_ops	= &driver_sysfs_ops,
 	.release	= driver_release,
 };
@@ -868,7 +868,7 @@ int bus_register(struct bus_type * bus)
 
 	kobject_set_name(&bus->drivers.kobj, "drivers");
 	bus->drivers.kobj.parent = &bus->subsys.kobj;
-	bus->drivers.ktype = &ktype_driver;
+	bus->drivers.ktype = &driver_ktype;
 	retval = kset_register(&bus->drivers);
 	if (retval)
 		goto bus_drivers_fail;