Merge branch 'sched/latest' of git://git.kernel.org/pub/scm/linux/kernel/git/ghaskins...

[linux-2.6-omap-h63xx.git] / drivers / net / ibmveth.c

diff --git a/drivers/net/ibmveth.c b/drivers/net/ibmveth.c
index 9bc0f178f24bfb9ff88e92ec937e19e5e9e2f47e..ca3bb9f7321b310ea4a26951aa71ba2c4ee95c4c 100644 (file)
--- 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;