diff --git a/[refs] b/[refs]
index b70bd3f14050..b0ec03a265c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 683b65f89a7c26d9a9180d25066815ef5a31bd71
+refs/heads/master: d1abc9a9aca06ceb795eb5405264eaafe016ec5c
diff --git a/trunk/drivers/net/atarilance.c b/trunk/drivers/net/atarilance.c
index 3134e5326231..8cb27cb7bca1 100644
--- a/trunk/drivers/net/atarilance.c
+++ b/trunk/drivers/net/atarilance.c
@@ -407,7 +407,7 @@ static noinline int __init addr_accessible(volatile void *regp, int wordflag,
 					   int writeflag)
 {
 	int		ret;
-	long	flags;
+	unsigned long	flags;
 	long	*vbr, save_berr;
 
 	local_irq_save(flags);