diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-15 17:17:54 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2007-10-15 17:17:54 -0700 |
| commit | 97cf354198ddc405575ec322c2749dfae8dc21e2 (patch) | |
| tree | dc7888ee982e10c02af47f8bfaf5da74c262baee | |
| parent | 47cb4aa90e9e923ebcd4e01be6ba2c3af982193e (diff) | |
| download | patches-97cf354198ddc405575ec322c2749dfae8dc21e2.tar.gz | |
2.6.23-git8 update
| -rw-r--r-- | driver/atm-convert-struct-class_device-to-struct-device.patch | 12 | ||||
| -rw-r--r-- | version | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/driver/atm-convert-struct-class_device-to-struct-device.patch b/driver/atm-convert-struct-class_device-to-struct-device.patch index 67491bebd84f7c..41d0ef1f175e04 100644 --- a/driver/atm-convert-struct-class_device-to-struct-device.patch +++ b/driver/atm-convert-struct-class_device-to-struct-device.patch @@ -10,9 +10,9 @@ Cc: Chas Williams <chas@cmf.nrl.navy.mil> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- - include/linux/atmdev.h | 4 +-- - net/atm/atm_sysfs.c | 64 ++++++++++++++++++++++++++----------------------- - 2 files changed, 37 insertions(+), 31 deletions(-) + include/linux/atmdev.h | 4 +- + net/atm/atm_sysfs.c | 66 ++++++++++++++++++++++++++----------------------- + 2 files changed, 38 insertions(+), 32 deletions(-) --- a/include/linux/atmdev.h +++ b/include/linux/atmdev.h @@ -84,7 +84,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> { char *pos = buf; struct atm_dev *adev = to_atm_dev(cdev); -@@ -90,21 +95,22 @@ static ssize_t show_link_rate(struct cla +@@ -90,22 +95,23 @@ static ssize_t show_link_rate(struct cla return pos - buf; } @@ -115,10 +115,12 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> NULL }; +-static int atm_uevent(struct class_device *cdev, struct kobj_uevent_env *env) + - static int atm_uevent(struct class_device *cdev, struct kobj_uevent_env *env) ++static int atm_uevent(struct device *cdev, struct kobj_uevent_env *env) { struct atm_dev *adev; + @@ -122,7 +128,7 @@ static int atm_uevent(struct class_devic return 0; } @@ -1 +1 @@ -2.6.23-git4 +2.6.23-git8 |