diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-01-05 13:17:24 (GMT) |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-01-05 13:17:24 (GMT) |
commit | 46483d10e5123d78cf9abf37577aa8e75f18b8a4 (patch) | |
tree | ffb646db8023433588ce87797a9428c90ec118bc /arch/x86/kernel/pci-swiotlb_64.c | |
parent | c59ab97e9ecdee9084d2da09e5a8ceea9a396508 (diff) | |
parent | 874d6a9555516cbac828131d573ce3d16ce47164 (diff) | |
download | linux-fsl-qoriq-46483d10e5123d78cf9abf37577aa8e75f18b8a4.tar.xz |
Merge branch 'core/iommu' into core/urgent
Conflicts:
lib/swiotlb.c
Diffstat (limited to 'arch/x86/kernel/pci-swiotlb_64.c')
-rw-r--r-- | arch/x86/kernel/pci-swiotlb_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c index 8cba374..d59c917 100644 --- a/arch/x86/kernel/pci-swiotlb_64.c +++ b/arch/x86/kernel/pci-swiotlb_64.c @@ -23,7 +23,7 @@ void *swiotlb_alloc(unsigned order, unsigned long nslabs) return (void *)__get_free_pages(GFP_DMA | __GFP_NOWARN, order); } -dma_addr_t swiotlb_phys_to_bus(phys_addr_t paddr) +dma_addr_t swiotlb_phys_to_bus(struct device *hwdev, phys_addr_t paddr) { return paddr; } |