projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c1d036c
)
[IA64] tioca: Fix assignment from incompatible pointer warnings
author
Jeff Mahoney
<jeffm@suse.com>
Thu, 24 Feb 2011 20:33:24 +0000
(15:33 -0500)
committer
Tony Luck
<tony.luck@intel.com>
Wed, 2 Mar 2011 22:04:07 +0000
(14:04 -0800)
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>
arch/ia64/sn/pci/tioca_provider.c
patch
|
blob
|
history
diff --git
a/arch/ia64/sn/pci/tioca_provider.c
b/arch/ia64/sn/pci/tioca_provider.c
index 4d4536e3b6f3d35f9f0e84a0180a14011215603f..9c271be9919aac37b2bbb87745fb8d6e64ba180f 100644
(file)
--- 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, u
64
paddr, size_t byte_count, int dma_flags)
+tioca_dma_map(struct pci_dev *pdev, u
nsigned long
paddr, size_t byte_count, int dma_flags)
{
u64 mapaddr;