From 1ae8789db3ab09e850104203b571e4a74b96e75c Mon Sep 17 00:00:00 2001 From: Sarah Sharp Date: Mon, 4 Jan 2010 12:20:17 -0800 Subject: [PATCH] --- yaml --- r: 185311 b: refs/heads/master c: 9c9a7dbf9a73191a24a13b9a0412355254a122c7 h: refs/heads/master i: 185309: ca32289055a32f6e0425971fd2f550b5bec3a258 185307: 56a6d0f924959d4a6f6dc3e9d011fa4f1cc92c5d 185303: 5cb7941b9a0ac6ee57a9f6f865431020fe0329ce 185295: fc593f7ffea16774f513fdf7d51acad2e3e58c31 185279: 40ad4ac408536081e8545e5ee6c9d8be4a4f572e v: v3 --- [refs] | 2 +- trunk/drivers/usb/host/xhci-dbg.c | 2 +- trunk/drivers/usb/host/xhci.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 84f0f2a34d1a..7bbbeb3ea804 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c38b94017c74061cabc342d3222387e0a5e8b6cd +refs/heads/master: 9c9a7dbf9a73191a24a13b9a0412355254a122c7 diff --git a/trunk/drivers/usb/host/xhci-dbg.c b/trunk/drivers/usb/host/xhci-dbg.c index b2915aea47ee..105fa8b025bb 100644 --- a/trunk/drivers/usb/host/xhci-dbg.c +++ b/trunk/drivers/usb/host/xhci-dbg.c @@ -406,7 +406,7 @@ static void dbg_rsvd64(struct xhci_hcd *xhci, u64 *ctx, dma_addr_t dma) } } -inline char *xhci_get_slot_state(struct xhci_hcd *xhci, +char *xhci_get_slot_state(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx) { struct xhci_slot_ctx *slot_ctx = xhci_get_slot_ctx(xhci, ctx); diff --git a/trunk/drivers/usb/host/xhci.h b/trunk/drivers/usb/host/xhci.h index 741ece482e31..e5eb09b2f38e 100644 --- a/trunk/drivers/usb/host/xhci.h +++ b/trunk/drivers/usb/host/xhci.h @@ -1210,7 +1210,7 @@ void xhci_dbg_erst(struct xhci_hcd *xhci, struct xhci_erst *erst); void xhci_dbg_cmd_ptrs(struct xhci_hcd *xhci); void xhci_dbg_ring_ptrs(struct xhci_hcd *xhci, struct xhci_ring *ring); void xhci_dbg_ctx(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx, unsigned int last_ep); -inline char *xhci_get_slot_state(struct xhci_hcd *xhci, +char *xhci_get_slot_state(struct xhci_hcd *xhci, struct xhci_container_ctx *ctx); /* xHCI memory management */