From 9aa3c4b508b053eb06ef16e504de4158b73ba311 Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@suse.de>
Date: Fri, 2 Nov 2007 16:19:59 -0700
Subject: [PATCH] --- yaml --- r: 75783 b: refs/heads/master c:
 5c03c7ab886859eb195440dbb6ccb8c30c4e84cc h: refs/heads/master i:   75781:
 9f94d6dabc5faa9f894394468b1f07e1687665ba   75779:
 2278090759b305309ce7cfc117992a19e54f28d1   75775:
 83ddbd32c4004ae363f003b1507ba7d908a37498 v: v3

---
 [refs]                        |  2 +-
 trunk/drivers/base/class.c    | 11 +++++++++--
 trunk/include/linux/kobject.h |  6 ------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 2866f68c407f..5979f2160c80 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 830d3cfb16728e2496edc2985ad8f68025135e37
+refs/heads/master: 5c03c7ab886859eb195440dbb6ccb8c30c4e84cc
diff --git a/trunk/drivers/base/class.c b/trunk/drivers/base/class.c
index d8a92c650b43..304f90eb9b00 100644
--- a/trunk/drivers/base/class.c
+++ b/trunk/drivers/base/class.c
@@ -453,8 +453,15 @@ static struct kset_uevent_ops class_uevent_ops = {
 	.uevent =	class_uevent,
 };
 
-static decl_subsys(class_obj, &class_uevent_ops);
-
+/*
+ * DO NOT copy how this is created, kset_create_and_add() should be
+ * called, but this is a hold-over from the old-way and will be deleted
+ * entirely soon.
+ */
+static struct kset class_obj_subsys = {
+	.kobj = { .k_name = "class_obj", },
+	.uevent_ops = &class_uevent_ops,
+};
 
 static int class_device_add_attrs(struct class_device * cd)
 {
diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h
index 673623f18464..9da3523e4a65 100644
--- a/trunk/include/linux/kobject.h
+++ b/trunk/include/linux/kobject.h
@@ -198,12 +198,6 @@ extern struct kobject * kset_find_obj(struct kset *, const char *);
 #define set_kset_name(str)	.kset = { .kobj = { .k_name = str } }
 
 
-#define decl_subsys(_name,_uevent_ops) \
-struct kset _name##_subsys = { \
-	.kobj = { .k_name = __stringify(_name) }, \
-	.uevent_ops =_uevent_ops, \
-}
-
 /* The global /sys/kernel/ kset for people to chain off of */
 extern struct kset *kernel_kset;
 /* The global /sys/hypervisor/ kobject for people to chain off of */