From 91d9ca555143f8a96bc5e084236cc1af665d307a Mon Sep 17 00:00:00 2001
From: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Date: Thu, 31 Jul 2008 01:14:24 +0200
Subject: [PATCH] --- yaml --- r: 107987 b: refs/heads/master c:
 d91d4bb9db4a7b2a78accff3560bfd42988c56e4 h: refs/heads/master i:   107985:
 23ae6a73d59921f8fa0a9171f2747f539c597fa5   107983:
 8a76ca1474d92ded5ed613abe597ae9846de32d9 v: v3

---
 [refs]                   | 2 +-
 trunk/drivers/net/meth.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9e8ca9217a6a..214e2fddf5b2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b1ab1b8a4f663a34c23f31d796fd08283b6077a
+refs/heads/master: d91d4bb9db4a7b2a78accff3560bfd42988c56e4
diff --git a/trunk/drivers/net/meth.c b/trunk/drivers/net/meth.c
index 4cb364e67dc6..0a97c26df6ab 100644
--- a/trunk/drivers/net/meth.c
+++ b/trunk/drivers/net/meth.c
@@ -100,7 +100,7 @@ static inline void load_eaddr(struct net_device *dev)
 	DPRINTK("Loading MAC Address: %s\n", print_mac(mac, dev->dev_addr));
 	macaddr = 0;
 	for (i = 0; i < 6; i++)
-		macaddr |= dev->dev_addr[i] << ((5 - i) * 8);
+		macaddr |= (u64)dev->dev_addr[i] << ((5 - i) * 8);
 
 	mace->eth.mac_addr = macaddr;
 }