diff --git a/[refs] b/[refs] index 39662fd78335..8534b7ad76c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 81ace5cd8fcb55e144f496af40d4275b03252456 +refs/heads/master: e5e38a86c0bbe8475543f10f0a48393a45df5182 diff --git a/trunk/include/linux/kobject.h b/trunk/include/linux/kobject.h index 718b48811288..390ae14b73e8 100644 --- a/trunk/include/linux/kobject.h +++ b/trunk/include/linux/kobject.h @@ -193,11 +193,6 @@ struct kset _name##_subsys = { \ .kobj = { .k_name = __stringify(_name) }, \ .uevent_ops =_uevent_ops, \ } -#define decl_subsys_name(_varname,_name,_uevent_ops) \ -struct kset _varname##_subsys = { \ - .kobj = { .k_name = __stringify(_name) }, \ - .uevent_ops =_uevent_ops, \ -} /* The global /sys/kernel/ subsystem for people to chain off of */ extern struct kset kernel_subsys;