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 commit 'upstream/master'
[pandora-kernel.git]
/
arch
/
ia64
/
hp
/
common
/
sba_iommu.c
diff --git
a/arch/ia64/hp/common/sba_iommu.c
b/arch/ia64/hp/common/sba_iommu.c
index
34421ae
..
4956be4
100644
(file)
--- a/
arch/ia64/hp/common/sba_iommu.c
+++ b/
arch/ia64/hp/common/sba_iommu.c
@@
-2147,7
+2147,7
@@
sba_dma_supported (struct device *dev, u64 mask)
}
int
-sba_dma_mapping_error
(
dma_addr_t dma_addr)
+sba_dma_mapping_error
(struct device *dev,
dma_addr_t dma_addr)
{
return 0;
}