aboutsummaryrefslogtreecommitdiffstats
path: root/driver
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@suse.de>2006-06-20 00:11:53 -0700
committerGreg Kroah-Hartman <gregkh@suse.de>2006-06-20 00:11:53 -0700
commit2762ec6d5b46de76ca2e4b871bfb5cfcb640904b (patch)
treeb8070de69151ad3d39ef04d7d066f11a84d5eae7 /driver
parent5f9cad239c1c4ecccd8530be834263e9e898ad91 (diff)
downloadpatches-2762ec6d5b46de76ca2e4b871bfb5cfcb640904b.tar.gz
remove unneeded changes in driver/driver-core-add-generic-subsystem-link-to-all-devices.patch
Diffstat (limited to 'driver')
-rw-r--r--driver/driver-core-add-generic-subsystem-link-to-all-devices.patch20
1 files changed, 2 insertions, 18 deletions
diff --git a/driver/driver-core-add-generic-subsystem-link-to-all-devices.patch b/driver/driver-core-add-generic-subsystem-link-to-all-devices.patch
index e7388b80b6ef5..58f8454c4326d 100644
--- a/driver/driver-core-add-generic-subsystem-link-to-all-devices.patch
+++ b/driver/driver-core-add-generic-subsystem-link-to-all-devices.patch
@@ -18,9 +18,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
block/genhd.c | 7 ++-----
drivers/base/bus.c | 2 ++
drivers/base/class.c | 2 ++
- drivers/base/core.c | 11 +++++++++--
+ drivers/base/core.c | 9 +++++++--
fs/partitions/check.c | 4 ++++
- 5 files changed, 19 insertions(+), 7 deletions(-)
+ 5 files changed, 17 insertions(+), 7 deletions(-)
--- gregkh-2.6.orig/block/genhd.c
+++ gregkh-2.6/block/genhd.c
@@ -109,22 +109,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
device_remove_file(dev, &dev->uevent_attr);
/* Notify the platform of the removal, in case they
-@@ -584,6 +589,7 @@ struct device *device_create(struct clas
- retval = device_register(dev);
- if (retval)
- goto error;
-+ sysfs_create_link(&dev->kobj, &class->subsys.kset.kobj, "subsystem");
-
- /* tie the class to the device */
- down(&class->sem);
-@@ -621,6 +627,7 @@ void device_destroy(struct class *class,
- up(&class->sem);
-
- if (dev) {
-+ sysfs_remove_link(&dev->kobj, "subsystem");
- list_del_init(&dev->node);
- device_unregister(dev);
- }
--- gregkh-2.6.orig/fs/partitions/check.c
+++ gregkh-2.6/fs/partitions/check.c
@@ -329,6 +329,7 @@ void delete_partition(struct gendisk *di