Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754012Ab0KCJB7 (ORCPT ); Wed, 3 Nov 2010 05:01:59 -0400 Received: from cantor2.suse.de ([195.135.220.15]:50485 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753743Ab0KCJBz (ORCPT ); Wed, 3 Nov 2010 05:01:55 -0400 Date: Wed, 03 Nov 2010 10:01:54 +0100 Message-ID: From: Takashi Iwai To: gimli Cc: linux-kernel@vger.kernel.org Subject: Re: [PATCH 6/6] MacBookAir3,1(3,2) alsa support In-Reply-To: <4CD075BC.3080402@dark-green.com> References: <2e2e589908fd826020cfede6291e6168@mognix.dark-green.com> <4CD075BC.3080402@dark-green.com> User-Agent: Wanderlust/2.15.6 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.7 Emacs/23.1 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) 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 Content-Length: 2252 Lines: 65 At Tue, 02 Nov 2010 21:34:04 +0100, gimli wrote: > > [1 ] > Rebased to 2.6.37-rc1 > > Signed-off-by: Edgar (gimli) Hucek Applied now. (But at the next time, it'd be helpful if you prepare a new patch again after rebase so that it can be applied directly via git-am.) Thanks, Takashi > Am 02.11.10 16:30, schrieb Takashi Iwai: > > At Tue, 02 Nov 2010 08:21:51 +0100, > > gimli wrote: > >> > >> This patch add support for the MacBookAir3,1 and MacBookAir3,2 to the alsa > >> sound system. > >> > >> Signed-off-by: Edgar (gimli) Hucek > > > > The patch isn't applicable to the latest upstream code. > > Could you rebase your patch to 2.6.37-rc1? > > > > > > thanks, > > > > Takashi > > > > > >> [2 snd_hda_macbookair.patch] > >> --- a/sound/pci/hda/patch_cirrus.c 2010-10-29 08:30:04.029681004 +0200 > >> +++ b/sound/pci/hda/patch_cirrus.c 2010-10-29 08:34:04.509681003 +0200 > >> @@ -1089,6 +1089,7 @@ > >> static struct snd_pci_quirk cs420x_cfg_tbl[] = { > >> SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55), > >> SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27), > >> + SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55), > >> {} /* terminator */ > >> }; > >> > > > > [2 snd_hda_macbookair.patch ] > diff -uNr linux-2.6.37-rc1/sound/pci/hda/patch_cirrus.c linux-2.6.37-rc1-patched/sound/pci/hda/patch_cirrus.c > --- linux-2.6.37-rc1/sound/pci/hda/patch_cirrus.c 2010-11-02 21:27:10.000000000 +0100 > +++ linux-2.6.37-rc1-patched/sound/pci/hda/patch_cirrus.c 2010-11-02 21:28:53.000000000 +0100 > @@ -1169,6 +1169,7 @@ > SND_PCI_QUIRK(0x10de, 0xcb79, "MacBookPro 5,5", CS420X_MBP55), > SND_PCI_QUIRK(0x10de, 0xcb89, "MacBookPro 7,1", CS420X_MBP55), > SND_PCI_QUIRK(0x8086, 0x7270, "IMac 27 Inch", CS420X_IMAC27), > + SND_PCI_QUIRK(0x10de, 0x0d94, "MacBookAir 3,1(2)", CS420X_MBP55), > {} /* terminator */ > }; > -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/