From 24402da9834c4116b612f60d49e4c3ce9829c7d6 Mon Sep 17 00:00:00 2001
From: Geert Uytterhoeven <geert@linux-m68k.org>
Date: Thu, 28 Oct 2010 11:34:58 -0700
Subject: [PATCH] --- yaml --- r: 220953 b: refs/heads/master c:
 d1abc9a9aca06ceb795eb5405264eaafe016ec5c h: refs/heads/master i:   220951:
 fab3bf66b21da898b23e71c843e0d17f55970d86 v: v3

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

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);