Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 185311
b: refs/heads/master
c: 9c9a7db
h: refs/heads/master
i:
  185309: ca32289
  185307: 56a6d0f
  185303: 5cb7941
  185295: fc593f7
  185279: 40ad4ac
v: v3
  • Loading branch information
Sarah Sharp authored and Greg Kroah-Hartman committed Mar 2, 2010
1 parent b1f8c55 commit 1ae8789
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: c38b94017c74061cabc342d3222387e0a5e8b6cd
refs/heads/master: 9c9a7dbf9a73191a24a13b9a0412355254a122c7
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/xhci-dbg.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion trunk/drivers/usb/host/xhci.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down

0 comments on commit 1ae8789

Please sign in to comment.