From f051f6969629d254727edc6692fc81b15341a86c Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@osdl.org>
Date: Sun, 16 Oct 2005 00:11:29 -0700
Subject: [PATCH] --- yaml --- r: 10335 b: refs/heads/master c:
 923833405d8d81b5be036093773d88d87fc7e1bd h: refs/heads/master i:   10333:
 65ddfec71923db7f71e630b5705390cf4345f3e2   10331:
 eb46b41ea2f252deff0f3b2628de20af2213719d   10327:
 148e8090c5124ff81b7797743f1809a1942daac1   10319:
 99779c1f9c5c08aa8cb5e0bba1fc5b250187aa6a   10303:
 f22120a2ddb063e4a1cc2f37250944e5ff75bb57 v: v3

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

diff --git a/[refs] b/[refs]
index 8791aa02169a..598dc9bb42f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 166d823d397b9f5404648cedfdefe13e10683694
+refs/heads/master: 923833405d8d81b5be036093773d88d87fc7e1bd
diff --git a/trunk/drivers/net/s2io.c b/trunk/drivers/net/s2io.c
index 30fbaf04773f..d303d162974f 100644
--- a/trunk/drivers/net/s2io.c
+++ b/trunk/drivers/net/s2io.c
@@ -2997,7 +2997,7 @@ int s2io_set_swapper(nic_t * sp)
 		 SWAPPER_CTRL_RXF_W_FE |
 		 SWAPPER_CTRL_XMSI_FE |
 		 SWAPPER_CTRL_STATS_FE | SWAPPER_CTRL_STATS_SE);
-	if (nic->intr_type == INTA)
+	if (sp->intr_type == INTA)
 		val64 |= SWAPPER_CTRL_XMSI_SE;
 	writeq(val64, &bar0->swapper_ctrl);
 #else