summaryrefslogtreecommitdiffstats
path: root/drivers/net/enic
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-06-14 22:59:34 -0700
committerDavid S. Miller <davem@davemloft.net>2010-06-14 22:59:34 -0700
commit6b08f516244abda22c07b5e7db10ef109dc43f2d (patch)
tree098fbb9b45213feeb5e093a9a690ef76e624469a /drivers/net/enic
parent0b5c25e8ac3a60bd01a52ca7405ba96aec8c16be (diff)
parent28c8e4790ca5ef75f54895ca46437f9fbb433ddf (diff)
downloadlinux-6b08f516244abda22c07b5e7db10ef109dc43f2d.tar.bz2
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ixgbe/ixgbe_ethtool.c With merge conflict help from Stephen Rothwell. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/enic')
-rw-r--r--drivers/net/enic/vnic_dev.c2
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;