Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 334827
b: refs/heads/master
c: 3dd7ea9
h: refs/heads/master
i:
  334825: 0a7f739
  334823: be8927b
v: v3
  • Loading branch information
Jingoo Han authored and Marek Szyprowski committed Oct 24, 2012
1 parent 92c68b6 commit f300c7f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 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: 871ae57adc5ed092c1341f411514d0e8482e2611
refs/heads/master: 3dd7ea922051e68854e016cfd2992226cfb5bb43
2 changes: 1 addition & 1 deletion trunk/arch/arm/mm/dma-mapping.c
Original file line number Diff line number Diff line change
Expand Up @@ -610,7 +610,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle,
gfp_t gfp, pgprot_t prot, bool is_coherent, const void *caller)
{
u64 mask = get_coherent_dma_mask(dev);
struct page *page;
struct page *page = NULL;
void *addr;

#ifdef CONFIG_DMA_API_DEBUG
Expand Down

0 comments on commit f300c7f

Please sign in to comment.