From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754672AbYDWIzW (ORCPT ); Wed, 23 Apr 2008 04:55:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753030AbYDWIzL (ORCPT ); Wed, 23 Apr 2008 04:55:11 -0400 Received: from ns2.suse.de ([195.135.220.15]:58415 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752991AbYDWIzK (ORCPT ); Wed, 23 Apr 2008 04:55:10 -0400 Date: Wed, 23 Apr 2008 10:55:08 +0200 Message-ID: From: Takashi Iwai To: Stas Sergeev Cc: Andrew Morton , linux-kernel@vger.kernel.org Subject: Re: 2.6.25-mm1 (snd-pcsp causes driver conflict) In-Reply-To: <480E2666.9080609@aknet.ru> References: <20080418014757.52fb4a4f.akpm@linux-foundation.org> <20080419021343.GA3503@nineveh.local> <20080418200237.b5a9e805.akpm@linux-foundation.org> <20080419041429.GA8508@anvil.corenet.prv> <20080418212934.bbe84ee2.akpm@linux-foundation.org> <480CD281.6050902@aknet.ru> <480E2666.9080609@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: X-Mailing-List: linux-kernel@vger.kernel.org At Tue, 22 Apr 2008 21:54:46 +0400, Stas Sergeev wrote: > > Hello. > > Takashi Iwai wrote: > > Err, no, this wasn't merged to sound git tree because apparently the > > patch is to 2.6.22 and you didn't resubmit it... > That's simply because the old one > applies fine. :) > > > No, I gave no ACK yet. > OK, sorry. > > > I'd rather add a new line with a single "depends on SND_PCSP=n". > > You see a clear difference in the art of dependencies, one for > > architectures and one for driver-specific. > Done. > > --- > - Update CREDITS with the pc-speaker > driver authors. > - Prevent pcspkr from being built together > with snd-pcsp. > > Signed-off-by: Stas Sergeev Thanks, applied to my git tree. git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git Meanwhile, we need to add a similar depenency to snd-pcsp as well, no? Takashi