From 6a7f27029db5584e0949fe88a6e5d245aa63ce42 Mon Sep 17 00:00:00 2001
From: Dave Jones <davej@redhat.com>
Date: Sun, 14 Oct 2007 22:57:45 +0200
Subject: [PATCH] --- yaml --- r: 68758 b: refs/heads/master c:
 b097976e8d6f6e6220161fa6b72b0798ce9f4f4c h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/alternative.c | 1 +
 trunk/drivers/net/sky2.c            | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 82d47f3a6d55..f7a87917f2e4 100644
--- 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
index bd72d94e713e..11b03d3c6fda 100644
--- 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
index 7967240534d5..68f728f0b600 100644
--- 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];