diff options
| author | Jeff Mahoney <jeffm@suse.com> | 2011-02-24 15:33:24 -0500 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2011-03-02 14:04:07 -0800 |
| commit | b4a6b3436531f6c5256e6d60d388c3c28ff1a0e9 (patch) | |
| tree | 87fb1fac6068ffeb2354f6ad915bd9e29e6a5e59 /arch/ia64/sn | |
| parent | c1d036c4d1cb00b7e8473a2ad0a78f13e13a8183 (diff) | |
| download | kernel_goldelico_gta04-b4a6b3436531f6c5256e6d60d388c3c28ff1a0e9.zip kernel_goldelico_gta04-b4a6b3436531f6c5256e6d60d388c3c28ff1a0e9.tar.gz kernel_goldelico_gta04-b4a6b3436531f6c5256e6d60d388c3c28ff1a0e9.tar.bz2 | |
[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 <jeffm@suse.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64/sn')
| -rw-r--r-- | arch/ia64/sn/pci/tioca_provider.c | 2 |
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 4d4536e..9c271be 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; |