diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 16:53:03 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-10-17 16:53:03 -0700 |
| commit | 8cbb804fc20a5d2065a95aeabe9ebae7fa6a6255 (patch) | |
| tree | ce6cbcbf644b6dbfbe6b78bdec6d6a70d5d27f89 /usb | |
| parent | 68b46735ba7406cc64ab4a8c5bd61254e66e1cd9 (diff) | |
| download | patches-8cbb804fc20a5d2065a95aeabe9ebae7fa6a6255.tar.gz | |
2.6.27-git7 resync
driver-core patches merged
Diffstat (limited to 'usb')
7 files changed, 19 insertions, 19 deletions
diff --git a/usb/usb-ehci-fix-remote-wakeup-support-for-arc-tdi-core.patch b/usb/usb-ehci-fix-remote-wakeup-support-for-arc-tdi-core.patch index 37ece8adac3b5d..cf6175240af175 100644 --- a/usb/usb-ehci-fix-remote-wakeup-support-for-arc-tdi-core.patch +++ b/usb/usb-ehci-fix-remote-wakeup-support-for-arc-tdi-core.patch @@ -41,7 +41,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> struct dma_pool *qh_pool; /* qh per active urb */ --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -705,7 +705,7 @@ static irqreturn_t ehci_irq (struct usb_ +@@ -706,7 +706,7 @@ static irqreturn_t ehci_irq (struct usb_ pcd_status = status; /* resume root hub? */ @@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> usb_hcd_resume_root_hub(hcd); while (i--) { -@@ -714,8 +714,11 @@ static irqreturn_t ehci_irq (struct usb_ +@@ -715,8 +715,11 @@ static irqreturn_t ehci_irq (struct usb_ if (pstatus & PORT_OWNER) continue; @@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> continue; /* start 20 msec resume signaling from this port, -@@ -730,9 +733,8 @@ static irqreturn_t ehci_irq (struct usb_ +@@ -731,9 +734,8 @@ static irqreturn_t ehci_irq (struct usb_ /* PCI errors [4.15.2.4] */ if (unlikely ((status & STS_FATAL) != 0)) { diff --git a/usb/usb-ehci-log-a-warning-if-ehci-hcd-is-not-loaded-first.patch b/usb/usb-ehci-log-a-warning-if-ehci-hcd-is-not-loaded-first.patch index cdcfdc45315b9b..52352aa0529d7a 100644 --- a/usb/usb-ehci-log-a-warning-if-ehci-hcd-is-not-loaded-first.patch +++ b/usb/usb-ehci-log-a-warning-if-ehci-hcd-is-not-loaded-first.patch @@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif /* __KERNEL__ */ --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1045,6 +1045,12 @@ static int __init ehci_hcd_init(void) +@@ -1046,6 +1046,12 @@ static int __init ehci_hcd_init(void) return -ENODEV; printk(KERN_INFO "%s: " DRIVER_DESC "\n", hcd_name); @@ -64,7 +64,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> pr_debug("%s: block sizes: qh %Zd qtd %Zd itd %Zd sitd %Zd\n", hcd_name, sizeof(struct ehci_qh), sizeof(struct ehci_qtd), -@@ -1052,8 +1058,10 @@ static int __init ehci_hcd_init(void) +@@ -1053,8 +1059,10 @@ static int __init ehci_hcd_init(void) #ifdef DEBUG ehci_debug_root = debugfs_create_dir("ehci", NULL); @@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #endif #ifdef PLATFORM_DRIVER -@@ -1101,6 +1109,8 @@ clean0: +@@ -1102,6 +1110,8 @@ clean0: debugfs_remove(ehci_debug_root); ehci_debug_root = NULL; #endif @@ -86,7 +86,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> return retval; } module_init(ehci_hcd_init); -@@ -1122,6 +1132,7 @@ static void __exit ehci_hcd_cleanup(void +@@ -1123,6 +1133,7 @@ static void __exit ehci_hcd_cleanup(void #ifdef DEBUG debugfs_remove(ehci_debug_root); #endif diff --git a/usb/usb-ehci-ohci-uhci-remove-version-numbers.patch b/usb/usb-ehci-ohci-uhci-remove-version-numbers.patch index 8384ab5895d7f7..737f6b05419bd3 100644 --- a/usb/usb-ehci-ohci-uhci-remove-version-numbers.patch +++ b/usb/usb-ehci-ohci-uhci-remove-version-numbers.patch @@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> hcd->self.controller->bus->name, --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -59,7 +59,6 @@ +@@ -60,7 +60,6 @@ * providing early devices for those host controllers to talk to! */ @@ -53,7 +53,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define DRIVER_AUTHOR "David Brownell" #define DRIVER_DESC "USB 2.0 'Enhanced' Host Controller (EHCI) Driver" -@@ -620,9 +619,9 @@ static int ehci_run (struct usb_hcd *hcd +@@ -621,9 +620,9 @@ static int ehci_run (struct usb_hcd *hcd temp = HC_VERSION(ehci_readl(ehci, &ehci->caps->hc_capbase)); ehci_info (ehci, @@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> ignore_oc ? ", overcurrent ignored" : ""); ehci_writel(ehci, INTR_MASK, -@@ -994,9 +993,7 @@ static int ehci_get_frame (struct usb_hc +@@ -995,9 +994,7 @@ static int ehci_get_frame (struct usb_hc /*-------------------------------------------------------------------------*/ @@ -76,7 +76,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> MODULE_AUTHOR (DRIVER_AUTHOR); MODULE_LICENSE ("GPL"); -@@ -1044,6 +1041,10 @@ static int __init ehci_hcd_init(void) +@@ -1045,6 +1042,10 @@ static int __init ehci_hcd_init(void) { int retval = 0; diff --git a/usb/usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch b/usb/usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch index c36f0370387962..72742c9190bc02 100644 --- a/usb/usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch +++ b/usb/usb-hub.c-add-initial_descriptor_timeout-module-parameter-for-usbcore.patch @@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt -@@ -2252,6 +2252,25 @@ and is between 256 and 4096 characters. +@@ -2253,6 +2253,25 @@ and is between 256 and 4096 characters. autosuspended. Devices for which the delay is set to a negative value won't be autosuspended at all. diff --git a/usb/usb-remove-code-associated-with-config_ppc_merge.patch b/usb/usb-remove-code-associated-with-config_ppc_merge.patch index 2b3393f6c9b5de..80be741912a397 100644 --- a/usb/usb-remove-code-associated-with-config_ppc_merge.patch +++ b/usb/usb-remove-code-associated-with-config_ppc_merge.patch @@ -46,7 +46,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define writel_be(val, addr) __raw_writel(val, (__force unsigned *)addr) --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -1020,11 +1020,6 @@ MODULE_LICENSE ("GPL"); +@@ -1021,11 +1021,6 @@ MODULE_LICENSE ("GPL"); #define PS3_SYSTEM_BUS_DRIVER ps3_ehci_driver #endif diff --git a/usb/usb-remove-info-macro-from-usb-input-drivers.patch b/usb/usb-remove-info-macro-from-usb-input-drivers.patch index 4f13907ef54694..9f5ceba114131e 100644 --- a/usb/usb-remove-info-macro-from-usb-input-drivers.patch +++ b/usb/usb-remove-info-macro-from-usb-input-drivers.patch @@ -73,7 +73,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c -@@ -1821,8 +1821,9 @@ aiptek_probe(struct usb_interface *intf, +@@ -1844,8 +1844,9 @@ aiptek_probe(struct usb_interface *intf, aiptek->curSetting.programmableDelay = speeds[i]; (void)aiptek_program_tablet(aiptek); if (aiptek->inputdev->absmax[ABS_X] > 0) { @@ -85,7 +85,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> break; } } -@@ -1830,7 +1831,8 @@ aiptek_probe(struct usb_interface *intf, +@@ -1853,7 +1854,8 @@ aiptek_probe(struct usb_interface *intf, /* Murphy says that some day someone will have a tablet that fails the above test. That's you, Frederic Rodrigo */ if (i == ARRAY_SIZE(speeds)) { @@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto fail2; } -@@ -1902,8 +1904,9 @@ static int __init aiptek_init(void) +@@ -1925,8 +1927,9 @@ static int __init aiptek_init(void) { int result = usb_register(&aiptek_driver); if (result == 0) { diff --git a/usb/usb-remove-warn-macro-from-usb-input-drivers.patch b/usb/usb-remove-warn-macro-from-usb-input-drivers.patch index 1713c5970e3616..d95f79bb36e106 100644 --- a/usb/usb-remove-warn-macro-from-usb-input-drivers.patch +++ b/usb/usb-remove-warn-macro-from-usb-input-drivers.patch @@ -275,7 +275,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/input/tablet/aiptek.c +++ b/drivers/input/tablet/aiptek.c -@@ -1683,20 +1683,21 @@ aiptek_probe(struct usb_interface *intf, +@@ -1706,20 +1706,21 @@ aiptek_probe(struct usb_interface *intf, aiptek = kzalloc(sizeof(struct aiptek), GFP_KERNEL); inputdev = input_allocate_device(); if (!aiptek || !inputdev) { @@ -300,7 +300,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto fail2; } -@@ -1841,7 +1842,8 @@ aiptek_probe(struct usb_interface *intf, +@@ -1864,7 +1865,8 @@ aiptek_probe(struct usb_interface *intf, */ err = sysfs_create_group(&intf->dev.kobj, &aiptek_attribute_group); if (err) { @@ -310,7 +310,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> goto fail3; } -@@ -1849,7 +1851,8 @@ aiptek_probe(struct usb_interface *intf, +@@ -1872,7 +1874,8 @@ aiptek_probe(struct usb_interface *intf, */ err = input_register_device(aiptek->inputdev); if (err) { |