diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-13 16:32:36 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-08-13 16:32:36 -0700 |
| commit | f71299d9cd21ffd04dbaea7cf95a6a565363f5fa (patch) | |
| tree | abbb67d20eb2631c450dbc6cfe1fe40c9db4fe9a /usb | |
| parent | 2bb40f7012cfea87bb60cbc535a9dad192b993b7 (diff) | |
| download | patches-f71299d9cd21ffd04dbaea7cf95a6a565363f5fa.tar.gz | |
2.6.27-rc3 sync
Diffstat (limited to 'usb')
| -rw-r--r-- | usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch b/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch index a0bb03e0739cc0..663d771495c105 100644 --- a/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch +++ b/usb/usb-convert-the-usb-host-controller-code-to-use-usb_dbg.patch @@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> hc32_to_cpup(ehci, &qh->hw_info2) & (QH_CMASK | QH_SMASK), --- a/drivers/usb/host/ohci-at91.c +++ b/drivers/usb/host/ohci-at91.c -@@ -57,7 +57,7 @@ static void at91_start_hc(struct platfor +@@ -56,7 +56,7 @@ static void at91_start_hc(struct platfor struct usb_hcd *hcd = platform_get_drvdata(pdev); struct ohci_regs __iomem *regs = hcd->regs; @@ -280,7 +280,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* * Start the USB clocks. -@@ -75,7 +75,7 @@ static void at91_stop_hc(struct platform +@@ -74,7 +74,7 @@ static void at91_stop_hc(struct platform struct usb_hcd *hcd = platform_get_drvdata(pdev); struct ohci_regs __iomem *regs = hcd->regs; @@ -329,7 +329,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> } --- a/drivers/usb/host/ohci-pnx4008.c +++ b/drivers/usb/host/ohci-pnx4008.c -@@ -333,7 +333,7 @@ static int __devinit usb_hcd_pnx4008_pro +@@ -332,7 +332,7 @@ static int __devinit usb_hcd_pnx4008_pro int ret = 0, irq; @@ -338,7 +338,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (usb_disabled()) { err("USB is disabled"); ret = -ENODEV; -@@ -400,7 +400,7 @@ static int __devinit usb_hcd_pnx4008_pro +@@ -399,7 +399,7 @@ static int __devinit usb_hcd_pnx4008_pro hcd->rsrc_start = pdev->resource[0].start; hcd->rsrc_len = pdev->resource[0].end - pdev->resource[0].start + 1; if (!request_mem_region(hcd->rsrc_start, hcd->rsrc_len, hcd_name)) { |