diff options
| author | Randy Dunlap <randy.dunlap@oracle.com> | 2010-06-08 09:00:20 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-13 00:23:45 +0200 |
| commit | d49aba84fe775671133295658f43f4d142a517f9 (patch) | |
| tree | 367f731720046001de6bb6f20ea4376303dcfb27 /drivers/net/enic/vnic_dev.c | |
| parent | Merge branch 'wimax-2.6.35.y' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
| download | linux-d49aba84fe775671133295658f43f4d142a517f9.tar.xz linux-d49aba84fe775671133295658f43f4d142a517f9.zip | |
enic: fix pci_alloc_consistent argument
Fix build warning on i386 (32-bit) with 32-bit dma_addr_t:
drivers/net/enic/vnic_dev.c: In function 'vnic_dev_init_prov':
drivers/net/enic/vnic_dev.c:716: warning: passing argument 3 of 'pci_alloc_consistent' from incompatible pointer type
include/asm-generic/pci-dma-compat.h:16: note: expected 'dma_addr_t *' but argument is of type 'u64 *'
Now builds without warnings on i386 and on x86_64.
Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com>
Cc: Scott Feldman <scofeldm@cisco.com>
Cc: Vasanthy Kolluri <vkolluri@cisco.com>
Cc: Roopa Prabhu <roprabhu@cisco.com>
Acked-by: Scott Feldman <scofeldm@cisco.com>
Diffstat (limited to 'drivers/net/enic/vnic_dev.c')
| -rw-r--r-- | drivers/net/enic/vnic_dev.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/enic/vnic_dev.c b/drivers/net/enic/vnic_dev.c index 2b3e16db5c82..e0d33281ec98 100644 --- a/drivers/net/enic/vnic_dev.c +++ b/drivers/net/enic/vnic_dev.c @@ -709,7 +709,7 @@ int vnic_dev_init_prov(struct vnic_dev *vdev, u8 *buf, u32 len) { u64 a0, a1 = len; int wait = 1000; - u64 prov_pa; + dma_addr_t prov_pa; void *prov_buf; int ret; |