From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1759491AbYEELCx@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1759491AbYEELCx (ORCPT <rfc822;w@1wt.eu>);
	Mon, 5 May 2008 07:02:53 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1758154AbYEELCd
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Mon, 5 May 2008 07:02:33 -0400
Received: from mx2.suse.de ([195.135.220.15]:33667 "EHLO mx2.suse.de"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1757096AbYEELCb (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Mon, 5 May 2008 07:02:31 -0400
Date: Mon, 05 May 2008 13:02:30 +0200
Message-ID: <s5hy76pc8u1.wl%tiwai@suse.de>
From: Takashi Iwai <tiwai@suse.de>
To: Stas Sergeev <stsp@aknet.ru>
Cc: Dmitry Torokhov <dmitry.torokhov@gmail.com>,
       Linux kernel <linux-kernel@vger.kernel.org>,
       Vojtech Pavlik <vojtech@suse.cz>,
       Michael Opdenacker <michael-lists@free-electrons.com>,
       Thomas Gleixner <tglx@linutronix.de>
Subject: Re: [patch][resend2] pcspkr: fix dependancies
In-Reply-To: <481E94EE.5080308@aknet.ru>
References: <481D3A08.2040500@aknet.ru>
	<20080505035733.GA11584@anvil.corenet.prv>
	<481E8C64.7090507@aknet.ru>
	<20080505043554.GC11584@anvil.corenet.prv>
	<481E94EE.5080308@aknet.ru>
User-Agent: Wanderlust/2.15.5 (Almost Unreal) SEMI/1.14.6 (Maruoka)
 FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 MULE XEmacs/21.5 (beta28)
 (fuki) (+CVS-20070806) (i386-suse-linux)
MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka")
Content-Type: text/plain; charset=US-ASCII
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

At Mon, 05 May 2008 09:02:38 +0400,
Stas Sergeev wrote:
> 
> --- a/arch/x86/kernel/Makefile	2008-04-26 13:40:06.000000000 +0400
> +++ b/arch/x86/kernel/Makefile	2008-04-26 18:22:49.000000000 +0400
> @@ -83,7 +83,7 @@
>  obj-$(CONFIG_VMI)		+= vmi_32.o vmiclock_32.o
>  obj-$(CONFIG_PARAVIRT)		+= paravirt.o paravirt_patch_$(BITS).o
>  
> -ifdef CONFIG_INPUT_PCSPKR
> +ifdef CONFIG_PCSPKR_PLATFORM
>  obj-y				+= pcspeaker.o
>  endif

This could be replaced now better with

  obj-$(CONFIG_PCSPKR_PLATFORM) += pcspeaker.o

without if-endif since CONFIG_PCSPKR_PLATFORM is a bool.

> --- a/sound/drivers/Kconfig	2008-04-26 13:40:21.000000000 +0400
> +++ b/sound/drivers/Kconfig	2008-04-26 18:24:59.000000000 +0400
> @@ -5,8 +5,8 @@
>  
>  
>  config SND_PCSP
> -	tristate "Internal PC speaker support"
> -	depends on X86_PC && HIGH_RES_TIMERS
> +	tristate "PC-Speaker support"
> +	depends on PCSPKR_PLATFORM && X86_PC && HIGH_RES_TIMERS
>  	help
>  	  If you don't have a sound card in your computer, you can include a
>  	  driver for the PC speaker which allows it to act like a primitive
> --- a/drivers/input/misc/Kconfig	2008-04-22 20:50:41.000000000 +0400
> +++ b/drivers/input/misc/Kconfig	2008-04-26 18:23:32.000000000 +0400
> @@ -14,7 +14,7 @@
>  
>  config INPUT_PCSPKR
>  	tristate "PC Speaker support"
> -	depends on ALPHA || X86 || MIPS || PPC_PREP || PPC_CHRP || PPC_PSERIES
> +	depends on PCSPKR_PLATFORM
>  	help
>  	  Say Y here if you want the standard PC Speaker to be used for
>  	  bells and whistles.

These two chunks don't apply on 2.6.26-git tree.  Please recreate the
patch.


thanks,

Takashi