aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/host/xhci-hcd.c
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2009-04-29 22:02:47 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2009-06-16 00:44:50 -0400
commitb7258a4aba2b24d5c27a0f6674795e83e7771969 (patch)
tree616af621400b760f0dbe113c54ee0b0638f9ed93 /drivers/usb/host/xhci-hcd.c
parentae636747146ea97efa18e04576acd3416e2514f5 (diff)
USB: xhci: use xhci_handle_event instead of handle_event
The former is way to generic for a global symbol. Fixes this build error: drivers/usb/built-in.o: In function `.handle_event': (.text+0x67dd0): multiple definition of `.handle_event' drivers/pcmcia/built-in.o:(.text+0xcfcc): first defined here drivers/usb/built-in.o: In function `handle_event': (.opd+0x5bc8): multiple definition of `handle_event' drivers/pcmcia/built-in.o:(.opd+0xed0): first defined here Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: Sarah Sharp <sarah.a.sharp@linux.intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/host/xhci-hcd.c')
-rw-r--r--drivers/usb/host/xhci-hcd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/usb/host/xhci-hcd.c b/drivers/usb/host/xhci-hcd.c
index 36e440ce88e5..197e6bb5b93d 100644
--- a/drivers/usb/host/xhci-hcd.c
+++ b/drivers/usb/host/xhci-hcd.c
@@ -246,7 +246,7 @@ static void xhci_work(struct xhci_hcd *xhci)
246 xhci_readl(xhci, &xhci->ir_set->irq_pending); 246 xhci_readl(xhci, &xhci->ir_set->irq_pending);
247 247
248 /* FIXME this should be a delayed service routine that clears the EHB */ 248 /* FIXME this should be a delayed service routine that clears the EHB */
249 handle_event(xhci); 249 xhci_handle_event(xhci);
250 250
251 /* Clear the event handler busy flag; the event ring should be empty. */ 251 /* Clear the event handler busy flag; the event ring should be empty. */
252 temp = xhci_readl(xhci, &xhci->ir_set->erst_dequeue[0]); 252 temp = xhci_readl(xhci, &xhci->ir_set->erst_dequeue[0]);