Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5246
b: refs/heads/master
c: 4e4b795
h: refs/heads/master
v: v3
  • Loading branch information
Marcelo Tosatti authored and Linus Torvalds committed Jul 27, 2005
1 parent be21e58 commit 8decdeb
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: 6ddcc9197beef7cba993c38cdcad45aefb557d33
refs/heads/master: 4e4b7952cd34af4dd78e012265d4bc858db6adf3
2 changes: 1 addition & 1 deletion trunk/drivers/serial/cpm_uart/cpm_uart_cpm1.c
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con)
memsz = L1_CACHE_ALIGN(pinfo->rx_nrfifos * pinfo->rx_fifosize) +
L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize);
if (is_con) {
mem_addr = (u8 *) m8xx_cpm_hostalloc(memsz);
mem_addr = (u8 *) cpm_dpram_addr(cpm_dpalloc(memsz, 8));
dma_addr = 0;
} else
mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr,
Expand Down

0 comments on commit 8decdeb

Please sign in to comment.