diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-16 17:57:01 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-05-16 17:57:01 -0700 |
| commit | 0087373c250f825ce2e2bc4cf8fe9f8afbe33ce4 (patch) | |
| tree | ceaccdb329069a8bd7e8ad0377688423c4e7a442 | |
| parent | 59373c85f24d7483f545fb2c110c486b726b8e48 (diff) | |
| download | patches-0087373c250f825ce2e2bc4cf8fe9f8afbe33ce4.tar.gz | |
2.6.34
| -rw-r--r-- | driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch | 2 | ||||
| -rw-r--r-- | usb/usb-staging-fix-up-usb_buffer_alloc-calls-in-the-staging-tree.patch | 4 | ||||
| -rw-r--r-- | version | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch b/driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch index ae087668fe2034..f22db9e394abb1 100644 --- a/driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch +++ b/driver-core/sysfs-add-struct-file-to-bin_attr-callbacks.patch @@ -1367,7 +1367,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct fb_info *fb_info = dev_get_drvdata(fbdev); --- a/drivers/usb/core/sysfs.c +++ b/drivers/usb/core/sysfs.c -@@ -658,7 +658,8 @@ const struct attribute_group *usb_device +@@ -646,7 +646,8 @@ const struct attribute_group *usb_device /* Binary descriptors */ static ssize_t diff --git a/usb/usb-staging-fix-up-usb_buffer_alloc-calls-in-the-staging-tree.patch b/usb/usb-staging-fix-up-usb_buffer_alloc-calls-in-the-staging-tree.patch index 3282f9764fbbde..9c42f51e20f3cf 100644 --- a/usb/usb-staging-fix-up-usb_buffer_alloc-calls-in-the-staging-tree.patch +++ b/usb/usb-staging-fix-up-usb_buffer_alloc-calls-in-the-staging-tree.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/staging/udlfb/udlfb.c +++ b/drivers/staging/udlfb/udlfb.c -@@ -1508,8 +1508,8 @@ static void dlfb_free_urb_list(struct dl +@@ -1509,8 +1509,8 @@ static void dlfb_free_urb_list(struct dl urb = unode->urb; /* Free each separately allocated piece */ @@ -40,7 +40,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_free_urb(urb); kfree(node); } -@@ -1543,8 +1543,8 @@ static int dlfb_alloc_urb_list(struct dl +@@ -1544,8 +1544,8 @@ static int dlfb_alloc_urb_list(struct dl } unode->urb = urb; @@ -1 +1 @@ -2.6.34-rc7-git6 +2.6.34 |