diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /arch/mn10300/mm/dma-alloc.c | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
Diffstat (limited to 'arch/mn10300/mm/dma-alloc.c')
| -rw-r--r-- | arch/mn10300/mm/dma-alloc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/mn10300/mm/dma-alloc.c b/arch/mn10300/mm/dma-alloc.c index 4e34880bea03..159acb02cfd4 100644 --- a/arch/mn10300/mm/dma-alloc.c +++ b/arch/mn10300/mm/dma-alloc.c | |||
| @@ -25,7 +25,8 @@ void *dma_alloc_coherent(struct device *dev, size_t size, | |||
| 25 | unsigned long addr; | 25 | unsigned long addr; |
| 26 | void *ret; | 26 | void *ret; |
| 27 | 27 | ||
| 28 | printk("dma_alloc_coherent(%s,%zu,,%x)\n", dev_name(dev), size, gfp); | 28 | pr_debug("dma_alloc_coherent(%s,%zu,%x)\n", |
| 29 | dev ? dev_name(dev) : "?", size, gfp); | ||
| 29 | 30 | ||
| 30 | if (0xbe000000 - pci_sram_allocated >= size) { | 31 | if (0xbe000000 - pci_sram_allocated >= size) { |
| 31 | size = (size + 255) & ~255; | 32 | size = (size + 255) & ~255; |