diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-12 14:43:32 +1000 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-12 14:43:32 +1000 |
| commit | b6ec995a21a9428aef620b5adf46d047a18d88b8 (patch) | |
| tree | 6719121e6605cbca524b687f47336b9bbf3b8d41 /arch/ppc64/kernel/pci_direct_iommu.c | |
| parent | 3a5f8c5f788d68e325d9fe3c26f4df5a5aee838a (diff) | |
| parent | da64c6ee6bb71bfb3f09d9bb89ce1aa4b1ee7e89 (diff) | |
Merge from Linus' tree
Diffstat (limited to 'arch/ppc64/kernel/pci_direct_iommu.c')
| -rw-r--r-- | arch/ppc64/kernel/pci_direct_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/pci_direct_iommu.c b/arch/ppc64/kernel/pci_direct_iommu.c index 57980a5674d7..e1a32f802c0b 100644 --- a/arch/ppc64/kernel/pci_direct_iommu.c +++ b/arch/ppc64/kernel/pci_direct_iommu.c @@ -30,7 +30,7 @@ #include <asm/ppc-pci.h> static void *pci_direct_alloc_coherent(struct device *hwdev, size_t size, - dma_addr_t *dma_handle, unsigned int __nocast flag) + dma_addr_t *dma_handle, gfp_t flag) { void *ret; |