From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750941AbWGQQmI (ORCPT ); Mon, 17 Jul 2006 12:42:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750971AbWGQQcu (ORCPT ); Mon, 17 Jul 2006 12:32:50 -0400 Received: from mail.kroah.org ([69.55.234.183]:14267 "EHLO perch.kroah.org") by vger.kernel.org with ESMTP id S1750963AbWGQQcj (ORCPT ); Mon, 17 Jul 2006 12:32:39 -0400 Date: Mon, 17 Jul 2006 09:25:39 -0700 From: Greg KH To: linux-kernel@vger.kernel.org, stable@kernel.org Cc: Justin Forbes , Zwane Mwaikambo , "Theodore Ts'o" , Randy Dunlap , Dave Jones , Chuck Wolber , Chris Wedgwood , torvalds@osdl.org, akpm@osdl.org, alan@lxorguk.ukuu.org.uk, Andi Kleen , Chris Wright , Greg Kroah-Hartman Subject: [patch 03/45] x86_64: Fix modular pc speaker Message-ID: <20060717162539.GD4829@kroah.com> References: <20060717160652.408007000@blue.kroah.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline; filename="x86_64-fix-modular-pc-speaker.patch" In-Reply-To: <20060717162452.GA4829@kroah.com> User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org -stable review patch. If anyone has any objections, please let us know. ------------------ It turned out that the following change is needed when the speaker is compiled as a module. Signed-off-by: Andi Kleen Signed-off-by: Linus Torvalds Signed-off-by: Chris Wright Signed-off-by: Greg Kroah-Hartman --- 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 static __init int add_pcspkr(void) { --