diff --git a/[refs] b/[refs] index df5d1f260500..691ca83c34c8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e32cc7366d88eeba12d22272a73dd83fb570ccb0 +refs/heads/master: cc972e896b303f453f5893ecf8eca0d0e395ab64 diff --git a/trunk/include/linux/device.h b/trunk/include/linux/device.h index a3b3ff15fc87..313e0b32bc09 100644 --- a/trunk/include/linux/device.h +++ b/trunk/include/linux/device.h @@ -51,7 +51,6 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *); struct bus_type { const char * name; - struct module * owner; struct kset subsys; struct kset *drivers_kset;