From 9f9fe4a7c4a898957ca8343b3374df2248ddbc85 Mon Sep 17 00:00:00 2001
From: Piotr Kaczuba <pepe@attika.ath.cx>
Date: Mon, 26 Jun 2006 13:59:38 +0200
Subject: [PATCH] --- yaml --- r: 30519 b: refs/heads/master c:
 9c63f8738734eb7e6d3f76ca03186f16ef88edf5 h: refs/heads/master i:   30517:
 671fa9780b458b082ddaf99ac793d47f940bc2c3   30515:
 cdd549067df3641f7cdd35e37beae4d6f511f538   30511:
 3aa933b1d98776e7382150ff4e77d474173feccc v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86_64/kernel/setup.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 97735ced00d5..e5105ab61c15 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d39159c27fe1375bb7773d364213b1047265022c
+refs/heads/master: 9c63f8738734eb7e6d3f76ca03186f16ef88edf5
diff --git a/trunk/arch/x86_64/kernel/setup.c b/trunk/arch/x86_64/kernel/setup.c
index 8ade23d7ae76..0d2d4f67aa73 100644
--- a/trunk/arch/x86_64/kernel/setup.c
+++ b/trunk/arch/x86_64/kernel/setup.c
@@ -1361,7 +1361,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)
 {