]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
tioca: Fix assignment from incompatible pointer warnings
authorJeff Mahoney <jeffm@suse.com>
Thu, 24 Feb 2011 20:33:24 +0000 (15:33 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Fri, 22 Apr 2011 15:49:58 +0000 (08:49 -0700)
commit b4a6b3436531f6c5256e6d60d388c3c28ff1a0e9 upstream.

The prototype for sn_pci_provider->{dma_map,dma_map_consistent} expects
an unsigned long instead of a u64.

Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
arch/ia64/sn/pci/tioca_provider.c

index efb454534e525c2e9bbb76d4447dc2a97224332c..129a0d1fa47771d1326e9eaeeb9307e7f927525e 100644 (file)
@@ -508,7 +508,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;