aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-10 17:19:18 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-07-10 17:19:18 -0700
commit16550012cf41452dd31e2d83183efe5d71ab04e2 (patch)
tree300ef8bd24b98199f8744d802a7b6135cea61c2b
parentcf780b16c24465a06fe5a383b0d7c6684bc33fc6 (diff)
downloadpatches-16550012cf41452dd31e2d83183efe5d71ab04e2.tar.gz
refresh
Diffstat
-rw-r--r--driver-core-bus_type-add-bus_groups.patch4
-rw-r--r--driver-core-bus_type-add-dev_groups.patch4
-rw-r--r--driver-core-bus_type-add-drv_groups.patch4
-rw-r--r--driver-core-remove-dev_attrs-from-struct-class.patch4
-rw-r--r--driver-core-remove-dev_bin_attrs-from-struct-class.patch4
-rw-r--r--f1.patch4
6 files changed, 12 insertions, 12 deletions
diff --git a/driver-core-bus_type-add-bus_groups.patch b/driver-core-bus_type-add-bus_groups.patch
index 397c9ca8b79a90..f3dda29edf3211 100644
--- a/driver-core-bus_type-add-bus_groups.patch
+++ b/driver-core-bus_type-add-bus_groups.patch
@@ -83,7 +83,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
kset_unregister(bus->p->devices_kset);
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -62,6 +62,7 @@ extern void bus_remove_file(struct bus_t
+@@ -66,6 +66,7 @@ extern void bus_remove_file(struct bus_t
* @bus_attrs: Default attributes of the bus.
* @dev_attrs: Default attributes of the devices on the bus.
* @drv_attrs: Default attributes of the device drivers on the bus.
@@ -91,7 +91,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* @dev_groups: Default attributes of the devices on the bus.
* @drv_groups: Default attributes of the device drivers on the bus.
* @match: Called, perhaps multiple times, whenever a new device or driver
-@@ -101,9 +102,10 @@ struct bus_type {
+@@ -105,9 +106,10 @@ struct bus_type {
const char *name;
const char *dev_name;
struct device *dev_root;
diff --git a/driver-core-bus_type-add-dev_groups.patch b/driver-core-bus_type-add-dev_groups.patch
index 9cd031d9819d9d..b312a37ecbc34b 100644
--- a/driver-core-bus_type-add-dev_groups.patch
+++ b/driver-core-bus_type-add-dev_groups.patch
@@ -87,7 +87,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -62,6 +62,7 @@ extern void bus_remove_file(struct bus_t
+@@ -66,6 +66,7 @@ extern void bus_remove_file(struct bus_t
* @bus_attrs: Default attributes of the bus.
* @dev_attrs: Default attributes of the devices on the bus.
* @drv_attrs: Default attributes of the device drivers on the bus.
@@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* @match: Called, perhaps multiple times, whenever a new device or driver
* is added for this bus. It should return a nonzero value if the
* given device can be handled by the given driver.
-@@ -100,8 +101,9 @@ struct bus_type {
+@@ -104,8 +105,9 @@ struct bus_type {
const char *dev_name;
struct device *dev_root;
struct bus_attribute *bus_attrs;
diff --git a/driver-core-bus_type-add-drv_groups.patch b/driver-core-bus_type-add-drv_groups.patch
index c95dc820306601..76cefe15b5f092 100644
--- a/driver-core-bus_type-add-drv_groups.patch
+++ b/driver-core-bus_type-add-drv_groups.patch
@@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -63,6 +63,7 @@ extern void bus_remove_file(struct bus_t
+@@ -67,6 +67,7 @@ extern void bus_remove_file(struct bus_t
* @dev_attrs: Default attributes of the devices on the bus.
* @drv_attrs: Default attributes of the device drivers on the bus.
* @dev_groups: Default attributes of the devices on the bus.
@@ -88,7 +88,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* @match: Called, perhaps multiple times, whenever a new device or driver
* is added for this bus. It should return a nonzero value if the
* given device can be handled by the given driver.
-@@ -102,8 +103,9 @@ struct bus_type {
+@@ -106,8 +107,9 @@ struct bus_type {
struct device *dev_root;
struct bus_attribute *bus_attrs;
struct device_attribute *dev_attrs; /* use dev_groups instead */
diff --git a/driver-core-remove-dev_attrs-from-struct-class.patch b/driver-core-remove-dev_attrs-from-struct-class.patch
index 1d7478b2180766..bea741a07f5754 100644
--- a/driver-core-remove-dev_attrs-from-struct-class.patch
+++ b/driver-core-remove-dev_attrs-from-struct-class.patch
@@ -85,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
}
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -314,7 +314,6 @@ int subsys_virtual_register(struct bus_t
+@@ -321,7 +321,6 @@ int subsys_virtual_register(struct bus_t
* @owner: The module owner.
* @class_attrs: Default attributes of this class.
* @dev_groups: Default attributes of the devices that belong to the class.
@@ -93,7 +93,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* @dev_bin_attrs: Default binary attributes of the devices belong to the class.
* @dev_kobj: The kobject that represents this class and links it into the hierarchy.
* @dev_uevent: Called when a device is added, removed from this class, or a
-@@ -343,7 +342,6 @@ struct class {
+@@ -350,7 +349,6 @@ struct class {
struct module *owner;
struct class_attribute *class_attrs;
diff --git a/driver-core-remove-dev_bin_attrs-from-struct-class.patch b/driver-core-remove-dev_bin_attrs-from-struct-class.patch
index d1fc656b98075c..e1b863ee2fe98c 100644
--- a/driver-core-remove-dev_bin_attrs-from-struct-class.patch
+++ b/driver-core-remove-dev_bin_attrs-from-struct-class.patch
@@ -94,7 +94,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -314,7 +314,6 @@ int subsys_virtual_register(struct bus_t
+@@ -321,7 +321,6 @@ int subsys_virtual_register(struct bus_t
* @owner: The module owner.
* @class_attrs: Default attributes of this class.
* @dev_groups: Default attributes of the devices that belong to the class.
@@ -102,7 +102,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* @dev_kobj: The kobject that represents this class and links it into the hierarchy.
* @dev_uevent: Called when a device is added, removed from this class, or a
* few other things that generate uevents to add the environment
-@@ -343,7 +342,6 @@ struct class {
+@@ -350,7 +349,6 @@ struct class {
struct class_attribute *class_attrs;
const struct attribute_group **dev_groups;
diff --git a/f1.patch b/f1.patch
index 150c799693b67a..a876248b348178 100644
--- a/f1.patch
+++ b/f1.patch
@@ -77,7 +77,7 @@
kset_unregister(bus->p->drivers_kset);
--- a/include/linux/device.h
+++ b/include/linux/device.h
-@@ -59,7 +59,6 @@ extern void bus_remove_file(struct bus_t
+@@ -63,7 +63,6 @@ extern void bus_remove_file(struct bus_t
* @name: The name of the bus.
* @dev_name: Used for subsystems to enumerate devices like ("foo%u", dev->id).
* @dev_root: Default device to use as the parent.
@@ -85,7 +85,7 @@
* @dev_attrs: Default attributes of the devices on the bus.
* @drv_attrs: Default attributes of the device drivers on the bus.
* @bus_groups: Default attributes of the bus.
-@@ -102,7 +101,6 @@ struct bus_type {
+@@ -106,7 +105,6 @@ struct bus_type {
const char *name;
const char *dev_name;
struct device *dev_root;
generated by cgit 1.2.3-korg (git 2.43.0) at 2026-03-01 15:49:39 +0000