From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753211AbYIFJxX (ORCPT ); Sat, 6 Sep 2008 05:53:23 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752372AbYIFJxP (ORCPT ); Sat, 6 Sep 2008 05:53:15 -0400 Received: from cantor.suse.de ([195.135.220.2]:49215 "EHLO mx1.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752326AbYIFJxO (ORCPT ); Sat, 6 Sep 2008 05:53:14 -0400 Date: Sat, 06 Sep 2008 11:53:08 +0200 Message-ID: From: Takashi Iwai To: Linus Torvalds Cc: Andrew Morton , linux-kernel@vger.kernel.org Subject: [GIT PULL] ALSA fix User-Agent: Wanderlust/2.12.0 (Your Wildest Dreams) SEMI/1.14.6 (Maruoka) FLIM/1.14.7 (=?ISO-8859-4?Q?Sanj=F2?=) APEL/10.6 Emacs/22.2 (x86_64-suse-linux-gnu) MULE/5.0 (SAKAKI) 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 Linus, please pull another ALSA fix for 2.6.27-rc5 from: git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6.git for-linus which is a simple regression fix in Kconfig. Thanks! Takashi === Takashi Iwai (1): Fix CONFIG_AC97_BUS dependency sound/Kconfig | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/sound/Kconfig b/sound/Kconfig index a37bee0..8ebf512 100644 --- a/sound/Kconfig +++ b/sound/Kconfig @@ -91,6 +91,9 @@ endif # SOUND_PRIME endif # !M68K +endif # SOUND + +# AC97_BUS is used from both sound and ucb1400 config AC97_BUS tristate help @@ -99,4 +102,3 @@ config AC97_BUS sound although they're sharing the AC97 bus. Concerned drivers should "select" this. -endif # SOUND