Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 73355
b: refs/heads/master
c: 93e29a2
h: refs/heads/master
i:
  73353: b86e0df
  73351: b696f22
v: v3
  • Loading branch information
Robert Schwebel authored and Russell King committed Nov 5, 2007
1 parent 6694742 commit ab68faa
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: c617360afaeeef4bf3768dc0537edfc72ffb2763
refs/heads/master: 93e29a2ecaa8372c5bb9b996b8b43e03a7c37f3c
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, kobject_name(dev->kobj)))
(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, kobject_name(dev->kobj)))
(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, kobject_name(dev->kobj)))
(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 ab68faa

Please sign in to comment.