From: Chris Wright <chrisw@sous-sol.org>
Date: Fri, 30 Jun 2006 01:46:15 +0000 (-0700)
Subject: x86_64 modular pcspkr fix, fwd from akpm
X-Git-Tag: v2.6.17.3~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e74430adb0575dbb225e7d1a059a76f748bbc7d1;p=thirdparty%2Fkernel%2Fstable-queue.git

x86_64 modular pcspkr fix, fwd from akpm
---

diff --git a/queue-2.6.17/series b/queue-2.6.17/series
index d91684eba08..2519d3528b1 100644
--- a/queue-2.6.17/series
+++ b/queue-2.6.17/series
@@ -1,2 +1,3 @@
 xfs-corruption-fix-for-next-stable-release.patch
 ib-mthca-restore-missing-pci-registers-after-reset.patch
+x86_64-fix-modular-pc-speaker.patch
diff --git a/queue-2.6.17/x86_64-fix-modular-pc-speaker.patch b/queue-2.6.17/x86_64-fix-modular-pc-speaker.patch
new file mode 100644
index 00000000000..bd12a27293d
--- /dev/null
+++ b/queue-2.6.17/x86_64-fix-modular-pc-speaker.patch
@@ -0,0 +1,26 @@
+From 9c63f8738734eb7e6d3f76ca03186f16ef88edf5 Mon Sep 17 00:00:00 2001
+From: Piotr Kaczuba <pepe@attika.ath.cx>
+Date: Mon, 26 Jun 2006 13:59:38 +0200
+Subject: x86_64: Fix modular pc speaker
+
+It turned out that the following change is needed when the speaker is
+compiled as a module.
+
+Signed-off-by: Andi Kleen <ak@suse.de>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Chris Wright <chrisw@sous-sol.org>
+---
+ arch/x86_64/kernel/setup.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- linux-2.6.17.2.orig/arch/x86_64/kernel/setup.c
++++ linux-2.6.17.2/arch/x86_64/kernel/setup.c
+@@ -1440,7 +1440,7 @@ struct seq_operations cpuinfo_op = {
+ 	.show =	show_cpuinfo,
+ };
+ 
+-#ifdef CONFIG_INPUT_PCSPKR
++#if defined(CONFIG_INPUT_PCSPKR) || defined(CONFIG_INPUT_PCSPKR_MODULE)
+ #include <linux/platform_device.h>
+ static __init int add_pcspkr(void)
+ {