aboutsummaryrefslogtreecommitdiff
path: root/arch/ia64
diff options
context:
space:
mode:
authorJeff Mahoney <jeffm@suse.com>2011-02-24 15:33:24 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-04-21 14:32:24 -0700
commit98cf27b486964537b26a515ab91cb233d416e300 (patch)
tree6b8c857c24fdd394c6cf7027a2b71ffad2ed933c /arch/ia64
parent3577818dd12f2908a6bdeb6283080d995f08f569 (diff)
downloadlinux-2.6.38-lt-ux500-98cf27b486964537b26a515ab91cb233d416e300.tar.gz
tioca: Fix assignment from incompatible pointer warnings
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>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/sn/pci/tioca_provider.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index 4d4536e3b6f..9c271be9919 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;