projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/~dwmw2/iommu-2.6.31
[linux-2.6-block.git]
/
arch
/
x86
/
kernel
/
pci-swiotlb.c
diff --git
a/arch/x86/kernel/pci-swiotlb.c
b/arch/x86/kernel/pci-swiotlb.c
index 3a0c51e0ba6d008286cc092e2311d86374093432..6af96ee4420080775f5afa466f2bad335434d935 100644
(file)
--- a/
arch/x86/kernel/pci-swiotlb.c
+++ b/
arch/x86/kernel/pci-swiotlb.c
@@
-28,7
+28,7
@@
dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr)
return paddr;
}
-phys_addr_t swiotlb_bus_to_phys(dma_addr_t baddr)
+phys_addr_t swiotlb_bus_to_phys(
struct device *hwdev,
dma_addr_t baddr)
{
return baddr;
}