2 files changed, 7 insertions, 7 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;
diff --git a/drivers/net/ibmveth.h b/drivers/net/ibmveth.h
index d28186948752..ec76ace66c6b 100644
--- a/drivers/net/ibmveth.h
+++ b/drivers/net/ibmveth.h
@@ -39,11 +39,11 @@
 #define IbmVethMcastRemoveFilter     0x2UL
 #define IbmVethMcastClearFilterTable 0x3UL
 
-#define IBMVETH_ILLAN_PADDED_PKT_CSUM   0x0000000000002000ULL
-#define IBMVETH_ILLAN_TRUNK_PRI_MASK    0x0000000000000F00ULL
-#define IBMVETH_ILLAN_IPV6_TCP_CSUM             0x0000000000000004ULL
-#define IBMVETH_ILLAN_IPV4_TCP_CSUM             0x0000000000000002ULL
-#define IBMVETH_ILLAN_ACTIVE_TRUNK              0x0000000000000001ULL
+#define IBMVETH_ILLAN_PADDED_PKT_CSUM   0x0000000000002000UL
+#define IBMVETH_ILLAN_TRUNK_PRI_MASK    0x0000000000000F00UL
+#define IBMVETH_ILLAN_IPV6_TCP_CSUM             0x0000000000000004UL
+#define IBMVETH_ILLAN_IPV4_TCP_CSUM             0x0000000000000002UL
+#define IBMVETH_ILLAN_ACTIVE_TRUNK              0x0000000000000001UL
 
 /* hcall macros */
 #define h_register_logical_lan(ua, buflst, rxq, fltlst, mac) \