diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2009-04-29 22:02:47 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-06-16 00:44:50 -0400 |
commit | b7258a4aba2b24d5c27a0f6674795e83e7771969 (patch) | |
tree | 616af621400b760f0dbe113c54ee0b0638f9ed93 /drivers/usb/host/xhci-ring.c | |
parent | ae636747146ea97efa18e04576acd3416e2514f5 (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-ring.c')
-rw-r--r-- | drivers/usb/host/xhci-ring.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c index f967a6df83c7..1feca20612d1 100644 --- a/drivers/usb/host/xhci-ring.c +++ b/drivers/usb/host/xhci-ring.c | |||
@@ -1009,7 +1009,7 @@ cleanup: | |||
1009 | * This function handles all OS-owned events on the event ring. It may drop | 1009 | * This function handles all OS-owned events on the event ring. It may drop |
1010 | * xhci->lock between event processing (e.g. to pass up port status changes). | 1010 | * xhci->lock between event processing (e.g. to pass up port status changes). |
1011 | */ | 1011 | */ |
1012 | void handle_event(struct xhci_hcd *xhci) | 1012 | void xhci_handle_event(struct xhci_hcd *xhci) |
1013 | { | 1013 | { |
1014 | union xhci_trb *event; | 1014 | union xhci_trb *event; |
1015 | int update_ptrs = 1; | 1015 | int update_ptrs = 1; |
@@ -1054,7 +1054,7 @@ void handle_event(struct xhci_hcd *xhci) | |||
1054 | set_hc_event_deq(xhci); | 1054 | set_hc_event_deq(xhci); |
1055 | } | 1055 | } |
1056 | /* Are there more items on the event ring? */ | 1056 | /* Are there more items on the event ring? */ |
1057 | handle_event(xhci); | 1057 | xhci_handle_event(xhci); |
1058 | } | 1058 | } |
1059 | 1059 | ||
1060 | /**** Endpoint Ring Operations ****/ | 1060 | /**** Endpoint Ring Operations ****/ |