diff options
| author | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-17 10:24:30 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-06-17 10:24:30 -0700 |
| commit | 257f39f2ae41a2830e6aac990ffcf9d419875ff5 (patch) | |
| tree | f8e7af9b2be14d8ef838cb8cffeb23cc2215feda | |
| parent | fb1b8406b362f338a732e27201431ff99c6f00ef (diff) | |
| download | patches-257f39f2ae41a2830e6aac990ffcf9d419875ff5.tar.gz | |
fix build bug on powerpc found by stephen
3 files changed, 18 insertions, 7 deletions
diff --git a/usb/usb-ehci-ehci-1.1-addendum-basic-lpm-feature-support.patch b/usb/usb-ehci-ehci-1.1-addendum-basic-lpm-feature-support.patch index 95fac8396679ba..d613de669d90d7 100644 --- a/usb/usb-ehci-ehci-1.1-addendum-basic-lpm-feature-support.patch +++ b/usb/usb-ehci-ehci-1.1-addendum-basic-lpm-feature-support.patch @@ -42,7 +42,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> hub_port_disable(hub, port1, 0); --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -100,6 +100,11 @@ static int ignore_oc = 0; +@@ -101,6 +101,11 @@ static int ignore_oc = 0; module_param (ignore_oc, bool, S_IRUGO); MODULE_PARM_DESC (ignore_oc, "ignore bogus hardware overcurrent indications"); @@ -54,7 +54,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #define INTR_MASK (STS_IAA | STS_FATAL | STS_PCD | STS_ERR | STS_INT) /*-------------------------------------------------------------------------*/ -@@ -304,6 +309,7 @@ static void end_unlink_async(struct ehci +@@ -305,6 +310,7 @@ static void end_unlink_async(struct ehci static void ehci_work(struct ehci_hcd *ehci); #include "ehci-hub.c" @@ -62,7 +62,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> #include "ehci-mem.c" #include "ehci-q.c" #include "ehci-sched.c" -@@ -603,6 +609,17 @@ static int ehci_init(struct usb_hcd *hcd +@@ -604,6 +610,17 @@ static int ehci_init(struct usb_hcd *hcd default: BUG(); } } diff --git a/usb/usb-ehci-ehci-1.1-addendum-enable-per-port-change-detect-bits.patch b/usb/usb-ehci-ehci-1.1-addendum-enable-per-port-change-detect-bits.patch index 2aa59fb010338c..4a68edba7d23fa 100644 --- a/usb/usb-ehci-ehci-1.1-addendum-enable-per-port-change-detect-bits.patch +++ b/usb/usb-ehci-ehci-1.1-addendum-enable-per-port-change-detect-bits.patch @@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c -@@ -583,6 +583,11 @@ static int ehci_init(struct usb_hcd *hcd +@@ -584,6 +584,11 @@ static int ehci_init(struct usb_hcd *hcd if (log2_irq_thresh < 0 || log2_irq_thresh > 6) log2_irq_thresh = 0; temp = 1 << (16 + log2_irq_thresh); @@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (HCC_CANPARK(hcc_params)) { /* HW default park == 3, on hardware that supports it (like * NVidia and ALI silicon), maximizes throughput on the async -@@ -781,6 +786,7 @@ static irqreturn_t ehci_irq (struct usb_ +@@ -782,6 +787,7 @@ static irqreturn_t ehci_irq (struct usb_ /* remote wakeup [4.3.1] */ if (status & STS_PCD) { unsigned i = HCS_N_PORTS (ehci->hcs_params); @@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> /* kick root hub later */ pcd_status = status; -@@ -789,9 +795,18 @@ static irqreturn_t ehci_irq (struct usb_ +@@ -790,9 +796,18 @@ static irqreturn_t ehci_irq (struct usb_ if (!(cmd & CMD_RUN)) usb_hcd_resume_root_hub(hcd); diff --git a/usb/usb-ehci-ehci-1.1-addendum-preparation.patch b/usb/usb-ehci-ehci-1.1-addendum-preparation.patch index 21ad12d6232f20..26616435e123ae 100644 --- a/usb/usb-ehci-ehci-1.1-addendum-preparation.patch +++ b/usb/usb-ehci-ehci-1.1-addendum-preparation.patch @@ -26,9 +26,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> --- drivers/usb/host/ehci-dbg.c | 144 ++++++++++++++++++++++++++++++++++++++++--- + drivers/usb/host/ehci-hcd.c | 1 drivers/usb/host/ehci.h | 1 include/linux/usb/ehci_def.h | 23 ++++++ - 3 files changed, 161 insertions(+), 7 deletions(-) + 4 files changed, 162 insertions(+), 7 deletions(-) --- a/drivers/usb/host/ehci-dbg.c +++ b/drivers/usb/host/ehci-dbg.c @@ -251,6 +252,16 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> if (!ehci->debug_registers) goto registers_error; return; +--- a/drivers/usb/host/ehci-hcd.c ++++ b/drivers/usb/host/ehci-hcd.c +@@ -36,6 +36,7 @@ + #include <linux/dma-mapping.h> + #include <linux/debugfs.h> + #include <linux/slab.h> ++#include <linux/uaccess.h> + + #include <asm/byteorder.h> + #include <asm/io.h> --- a/drivers/usb/host/ehci.h +++ b/drivers/usb/host/ehci.h @@ -157,6 +157,7 @@ struct ehci_hcd { /* one per controlle |