git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of /home/cbou/linux-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
sn
/
pci
/
pci_dma.c
diff --git
a/arch/ia64/sn/pci/pci_dma.c
b/arch/ia64/sn/pci/pci_dma.c
index
52175af
..
53ebb64
100644
(file)
--- a/
arch/ia64/sn/pci/pci_dma.c
+++ b/
arch/ia64/sn/pci/pci_dma.c
@@
-350,7
+350,7
@@
void sn_dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg,
}
EXPORT_SYMBOL(sn_dma_sync_sg_for_device);
-int sn_dma_mapping_error(dma_addr_t dma_addr)
+int sn_dma_mapping_error(
struct device *dev,
dma_addr_t dma_addr)
{
return 0;
}