Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 72951
b: refs/heads/master
c: 5984a2f
h: refs/heads/master
i:
  72949: 59b4b9d
  72947: 78353ac
  72943: d830a0e
v: v3
  • Loading branch information
Russell King authored and Russell King committed Oct 31, 2007
1 parent 6e0ce51 commit c94266c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: a80770ce4d8e0e83a32298453c0a8e78444f8184
refs/heads/master: 5984a2fc7e7c9ab118e78ae9799e98fc4ade40f9
6 changes: 3 additions & 3 deletions trunk/arch/arm/mach-netx/xc.c
Original file line number Diff line number Diff line change
Expand Up @@ -190,15 +190,15 @@ struct xc *request_xc(int xcno, struct device *dev)
goto exit;

if (!request_mem_region
(NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, dev->kobj.name))
(NETX_PA_XPEC(xcno), XPEC_MEM_SIZE, kobject_name(dev->kobj)))
goto exit_free;

if (!request_mem_region
(NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, dev->kobj.name))
(NETX_PA_XMAC(xcno), XMAC_MEM_SIZE, kobject_name(dev->kobj)))
goto exit_release_1;

if (!request_mem_region
(SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, dev->kobj.name))
(SRAM_INTERNAL_PHYS(xcno), SRAM_MEM_SIZE, kobject_name(dev->kobj)))
goto exit_release_2;

x->xpec_base = (void * __iomem)io_p2v(NETX_PA_XPEC(xcno));
Expand Down

0 comments on commit c94266c

Please sign in to comment.