diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-14 11:08:28 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-12-14 11:08:28 -0800 |
| commit | e62d1a68ce38e18af8fac4d09916eebc4fb9d1cd (patch) | |
| tree | 48ca2295fc13e2d91e37d04c0128d8fc0d357784 /usb | |
| parent | cb800587b993a7c4b8c30a42b1304c148a49e8a9 (diff) | |
| download | patches-e62d1a68ce38e18af8fac4d09916eebc4fb9d1cd.tar.gz | |
refresh for 2.6.15-rc5-git4
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-driver-owner-removal.patch | 4 | ||||
| -rw-r--r-- | usb/usb-mark-various-usb-tables-const.patch | 2 | ||||
| -rw-r--r-- | usb/usb-wakeup-flag-updates-sl811-hcd.patch | 9 |
3 files changed, 8 insertions, 7 deletions
diff --git a/usb/usb-driver-owner-removal.patch b/usb/usb-driver-owner-removal.patch index 307b54acbe95a5..b3b6691c8c138f 100644 --- a/usb/usb-driver-owner-removal.patch +++ b/usb/usb-driver-owner-removal.patch @@ -564,7 +564,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .disconnect = ati_remote_disconnect, --- gregkh-2.6.orig/drivers/usb/input/hid-core.c +++ gregkh-2.6/drivers/usb/input/hid-core.c -@@ -1928,7 +1928,6 @@ static struct usb_device_id hid_usb_ids +@@ -1930,7 +1930,6 @@ static struct usb_device_id hid_usb_ids MODULE_DEVICE_TABLE (usb, hid_usb_ids); static struct usb_driver hid_driver = { @@ -1304,7 +1304,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> .disconnect = cpia_disconnect, --- gregkh-2.6.orig/drivers/media/video/em28xx/em28xx-video.c +++ gregkh-2.6/drivers/media/video/em28xx/em28xx-video.c -@@ -1895,7 +1895,6 @@ static void em28xx_usb_disconnect(struct +@@ -1884,7 +1884,6 @@ static void em28xx_usb_disconnect(struct } static struct usb_driver em28xx_usb_driver = { diff --git a/usb/usb-mark-various-usb-tables-const.patch b/usb/usb-mark-various-usb-tables-const.patch index 5ba1598bf5e6e7..abb0e42aeb5ac7 100644 --- a/usb/usb-mark-various-usb-tables-const.patch +++ b/usb/usb-mark-various-usb-tables-const.patch @@ -193,7 +193,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> 0x00D9, 0x00D4, 0x00CF, 0x00C9, 0x00C4, 0x00BE, 0x00B8, 0x00B1, --- gregkh-2.6.orig/drivers/usb/input/hid-core.c +++ gregkh-2.6/drivers/usb/input/hid-core.c -@@ -1452,7 +1452,7 @@ void hid_init_reports(struct hid_device +@@ -1454,7 +1454,7 @@ void hid_init_reports(struct hid_device * Alphabetically sorted blacklist by quirk type. */ diff --git a/usb/usb-wakeup-flag-updates-sl811-hcd.patch b/usb/usb-wakeup-flag-updates-sl811-hcd.patch index 15147389a83252..4efa8760260ad6 100644 --- a/usb/usb-wakeup-flag-updates-sl811-hcd.patch +++ b/usb/usb-wakeup-flag-updates-sl811-hcd.patch @@ -15,9 +15,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> drivers/usb/host/sl811-hcd.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) ---- gregkh-2.6.orig/drivers/usb/host/sl811-hcd.c 2005-11-11 22:48:28.000000000 -0800 -+++ gregkh-2.6/drivers/usb/host/sl811-hcd.c 2005-11-12 14:14:27.000000000 -0800 -@@ -1581,7 +1581,9 @@ +--- +--- gregkh-2.6.orig/drivers/usb/host/sl811-hcd.c ++++ gregkh-2.6/drivers/usb/host/sl811-hcd.c +@@ -1581,7 +1581,9 @@ sl811h_start(struct usb_hcd *hcd) hcd->state = HC_STATE_RUNNING; if (sl811->board) { @@ -28,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> hcd->power_budget = sl811->board->power * 2; } -@@ -1805,7 +1807,7 @@ +@@ -1805,7 +1807,7 @@ sl811h_resume(struct platform_device *de * let's assume it'd only be powered to enable remote wakeup. */ if (dev->dev.power.power_state.event == PM_EVENT_SUSPEND |