diff options
| author | David S. Miller <davem@davemloft.net> | 2010-06-15 07:59:34 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-06-15 07:59:34 +0200 |
| commit | 6b08f516244abda22c07b5e7db10ef109dc43f2d (patch) | |
| tree | 098fbb9b45213feeb5e093a9a690ef76e624469a /drivers/net/enic | |
| parent | irttp: Print device parameters and statistics as unsigned (diff) | |
| parent | ixgbe: fix automatic LRO/RSC settings for low latency (diff) | |
| download | linux-6b08f516244abda22c07b5e7db10ef109dc43f2d.tar.xz linux-6b08f516244abda22c07b5e7db10ef109dc43f2d.zip | |
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.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; |