From 6d097f57f2f857b6a3d9cce576ffd5fc2c404675 Mon Sep 17 00:00:00 2001 From: Yegor Yefremov Date: Tue, 8 Jun 2010 08:57:13 +0200 Subject: [PATCH] --- yaml --- r: 200307 b: refs/heads/master c: f534116308a0d553641725c4619814337758784f h: refs/heads/master i: 200305: 7cd7af12cc34007537257be4ec4bc97080a90c0f 200303: 0715cbd78ac26290c007675ff5164cd8f25d83dd v: v3 --- [refs] | 2 +- trunk/sound/atmel/ac97c.c | 2 +- trunk/sound/pci/hda/patch_realtek.c | 3 --- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 115be4458749..c3cb8006fee6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ab669967d0ecf784567843180e715ccb0e42db36 +refs/heads/master: f534116308a0d553641725c4619814337758784f diff --git a/trunk/sound/atmel/ac97c.c b/trunk/sound/atmel/ac97c.c index 428121a7e705..10c3a871a12d 100644 --- a/trunk/sound/atmel/ac97c.c +++ b/trunk/sound/atmel/ac97c.c @@ -657,7 +657,7 @@ static irqreturn_t atmel_ac97c_interrupt(int irq, void *dev) if (sr & AC97C_SR_CAEVT) { struct snd_pcm_runtime *runtime; int offset, next_period, block_size; - dev_info(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n", + dev_dbg(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n", casr & AC97C_CSR_OVRUN ? " OVRUN" : "", casr & AC97C_CSR_RXRDY ? " RXRDY" : "", casr & AC97C_CSR_UNRUN ? " UNRUN" : "", diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c index fc767b6b4785..d792cddbf4c2 100644 --- a/trunk/sound/pci/hda/patch_realtek.c +++ b/trunk/sound/pci/hda/patch_realtek.c @@ -9477,9 +9477,6 @@ static struct snd_pci_quirk alc882_ssid_cfg_tbl[] = { SND_PCI_QUIRK(0x106b, 0x2800, "AppleTV", ALC885_IMAC24), SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC885_MBP3), SND_PCI_QUIRK(0x106b, 0x3000, "iMac", ALC889A_MB31), - SND_PCI_QUIRK(0x106b, 0x3200, "iMac 7,1 Aluminum", ALC882_ASUS_A7M), - SND_PCI_QUIRK(0x106b, 0x3400, "MacBookAir 1,1", ALC885_MBP3), - SND_PCI_QUIRK(0x106b, 0x3500, "MacBookAir 2,1", ALC885_MBA21), SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31), SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3), SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24),