---

yaml --- r: 68758 b: refs/heads/master c: b097976 h: refs/heads/master v: v3
git-mirror · Oct 14, 2007 · 6a7f270 · 6a7f270
1 parent 25f8a70
commit 6a7f270
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c0d6b34d6ee11ff979cbdac9a59b47a74cb9f43
+refs/heads/master: b097976e8d6f6e6220161fa6b72b0798ce9f4f4c
diff --git a/trunk/arch/x86/kernel/alternative.c b/trunk/arch/x86/kernel/alternative.c
@@ -10,6 +10,7 @@
 #include <asm/pgtable.h>
 #include <asm/mce.h>
 #include <asm/nmi.h>
+#include <asm/vsyscall.h>
 
 #define MAX_PATCH_LEN (255-1)
 

diff --git a/trunk/drivers/net/sky2.c b/trunk/drivers/net/sky2.c
@@ -4396,7 +4396,7 @@ static void sky2_shutdown(struct pci_dev *pdev)
 	if (!hw)
 		return;
 
-	del_timer_sync(&hw->watchdog_timer);
+	napi_disable(&hw->napi);
 
 	for (i = 0; i < hw->ports; i++) {
 		struct net_device *dev = hw->dev[i];