diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-29 16:10:18 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-06-29 16:10:18 -0700 |
| commit | 298b852cd3e6cd042650ac35390b6c6be18269e4 (patch) | |
| tree | ec43dbb6b5c8196e53985529897c7f03f054b21e /driver | |
| parent | 9716ed1bd85214afb9a25b2d306254530b1802a5 (diff) | |
| download | patches-298b852cd3e6cd042650ac35390b6c6be18269e4.tar.gz | |
refresh
Diffstat (limited to 'driver')
| -rw-r--r-- | driver/device-class-attr.patch | 6 | ||||
| -rw-r--r-- | driver/device-groups.patch | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/driver/device-class-attr.patch b/driver/device-class-attr.patch index 4b230571bd6b6..ec55e5f68cd25 100644 --- a/driver/device-class-attr.patch +++ b/driver/device-class-attr.patch @@ -130,7 +130,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * need to do anything... --- gregkh-2.6.orig/include/linux/device.h +++ gregkh-2.6/include/linux/device.h -@@ -148,12 +148,16 @@ struct class { +@@ -152,12 +152,16 @@ struct class { struct class_attribute * class_attrs; struct class_device_attribute * class_dev_attrs; @@ -144,6 +144,6 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> void (*release)(struct class_device *dev); void (*class_release)(struct class *class); + void (*dev_release)(struct device *dev); - }; - extern int class_register(struct class *); + int (*suspend)(struct device *, pm_message_t state); + int (*resume)(struct device *); diff --git a/driver/device-groups.patch b/driver/device-groups.patch index f2726ee0ff44a..26c0d5e7b21a1 100644 --- a/driver/device-groups.patch +++ b/driver/device-groups.patch @@ -80,7 +80,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> * need to do anything... --- gregkh-2.6.orig/include/linux/device.h +++ gregkh-2.6/include/linux/device.h -@@ -338,6 +338,7 @@ struct device { +@@ -345,6 +345,7 @@ struct device { struct list_head node; struct class *class; /* optional*/ dev_t devt; /* dev_t, creates the sysfs "dev" */ |