From: Jeff Mahoney Date: Thu, 24 Feb 2011 20:33:24 +0000 (-0500) Subject: [IA64] tioca: Fix assignment from incompatible pointer warnings X-Git-Tag: v2.6.39-rc1~465^2~1^2 X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=b4a6b3436531f6c5256e6d60d388c3c28ff1a0e9;hp=c1d036c4d1cb00b7e8473a2ad0a78f13e13a8183 [IA64] tioca: Fix assignment from incompatible pointer warnings The prototype for sn_pci_provider->{dma_map,dma_map_consistent} expects an unsigned long instead of a u64. Signed-off-by: Jeff Mahoney Signed-off-by: Tony Luck --- diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c index 4d4536e3b6f3..9c271be9919a 100644 --- a/arch/ia64/sn/pci/tioca_provider.c +++ b/arch/ia64/sn/pci/tioca_provider.c @@ -509,7 +509,7 @@ tioca_dma_unmap(struct pci_dev *pdev, dma_addr_t bus_addr, int dir) * use the GART mapped mode. */ static u64 -tioca_dma_map(struct pci_dev *pdev, u64 paddr, size_t byte_count, int dma_flags) +tioca_dma_map(struct pci_dev *pdev, unsigned long paddr, size_t byte_count, int dma_flags) { u64 mapaddr;