From cb52343def6cc09b6172cac87aabf0626ecf8672 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@sw.ru>
Date: Fri, 6 Jul 2007 18:57:13 +0400
Subject: [PATCH] --- yaml --- r: 58748 b: refs/heads/master c:
 099575b6cb7eaf18211ba72de56264f67651b90b h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index f551a305cc26..384bc45dbd58 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9514bfe5d92000a9fd6f3c44aa775819b5d78aaf
+refs/heads/master: 099575b6cb7eaf18211ba72de56264f67651b90b
diff --git a/trunk/drivers/net/macmace.c b/trunk/drivers/net/macmace.c
index fef3193121f9..9a343b965975 100644
--- a/trunk/drivers/net/macmace.c
+++ b/trunk/drivers/net/macmace.c
@@ -577,7 +577,7 @@ static irqreturn_t mace_interrupt(int irq, void *dev_id)
 	struct mace_data *mp = netdev_priv(dev);
 	volatile struct mace *mb = mp->mace;
 	int intr, fs;
-	unsigned int flags;
+	unsigned long flags;
 
 	/* don't want the dma interrupt handler to fire */
 	local_irq_save(flags);