diff options
| author | Ingo Molnar <[email protected]> | 2009-01-11 02:41:39 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2009-01-11 02:41:39 +0000 |
| commit | abede81c4fb2e3b85d8760f25e3da39d2c69a134 (patch) | |
| tree | 26c893ec108d837eb9171d678c55a1cea7b22af4 /drivers/net/ibmveth.c | |
| parent | rcu: fix bug in rcutorture system-shutdown code (diff) | |
| parent | Linux 2.6.29-rc1 (diff) | |
| download | kernel-abede81c4fb2e3b85d8760f25e3da39d2c69a134.tar.gz kernel-abede81c4fb2e3b85d8760f25e3da39d2c69a134.zip | |
Merge commit 'v2.6.29-rc1' into core/urgent
Diffstat (limited to 'drivers/net/ibmveth.c')
| -rw-r--r-- | drivers/net/ibmveth.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c index 9bc0f178f24b..ca3bb9f7321b 100644 --- a/drivers/net/ibmveth.c +++ b/drivers/net/ibmveth.c @@ -754,7 +754,7 @@ static int ibmveth_set_csum_offload(struct net_device *dev, u32 data, void (*done) (struct net_device *, u32)) { struct ibmveth_adapter *adapter = netdev_priv(dev); - u64 set_attr, clr_attr, ret_attr; + unsigned long set_attr, clr_attr, ret_attr; long ret; int rc1 = 0, rc2 = 0; int restart = 0; @@ -1209,7 +1209,7 @@ static int __devinit ibmveth_probe(struct vio_dev *dev, const struct vio_device_ long ret; struct net_device *netdev; struct ibmveth_adapter *adapter; - u64 set_attr, ret_attr; + unsigned long set_attr, ret_attr; unsigned char *mac_addr_p; unsigned int *mcastFilterSize_p; |