diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-05-28 16:35:13 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-05-28 16:35:13 -0400 |
| commit | b53471711f21ba0e151075f0e1d6d531eb50f1b1 (patch) | |
| tree | e912dbe14b6af76b0ebe853a9976c99616bb8a4c /drivers/serial/cpm_uart/cpm_uart_cpm2.c | |
| parent | 983f27d37d4fc72c252835cb2ee3103b360735a6 (diff) | |
| parent | 83055d46e5eddbb3574ef5e9c0d9c021bcb75c0b (diff) | |
| download | op-kernel-dev-b53471711f21ba0e151075f0e1d6d531eb50f1b1.zip op-kernel-dev-b53471711f21ba0e151075f0e1d6d531eb50f1b1.tar.gz | |
Merge branch 'velocity' of git://electric-eye.fr.zoreil.com/home/romieu/linux-2.6 into upstream
Diffstat (limited to 'drivers/serial/cpm_uart/cpm_uart_cpm2.c')
| -rw-r--r-- | drivers/serial/cpm_uart/cpm_uart_cpm2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/serial/cpm_uart/cpm_uart_cpm2.c b/drivers/serial/cpm_uart/cpm_uart_cpm2.c index 4b2de08..cdba128 100644 --- a/drivers/serial/cpm_uart/cpm_uart_cpm2.c +++ b/drivers/serial/cpm_uart/cpm_uart_cpm2.c @@ -213,7 +213,7 @@ int cpm_uart_allocbuf(struct uart_cpm_port *pinfo, unsigned int is_con) L1_CACHE_ALIGN(pinfo->tx_nrfifos * pinfo->tx_fifosize); if (is_con) { mem_addr = alloc_bootmem(memsz); - dma_addr = mem_addr; + dma_addr = virt_to_bus(mem_addr); } else mem_addr = dma_alloc_coherent(NULL, memsz, &dma_addr, |
