tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6:
ALSA: sound/spi: patch for the unuseful variable removal
ALSA: hda - Add SSID table for iMac7,1.
ALSA: hda - Add SSID table for MacBookAir1,1
ALSA: hda - Add SSID table for MacBookAir2,1
ALSA: atmel: set "channel A event" output to debug

Linus Torvalds e1f38e2c 85ca7886

+4 -2
+1 -1
sound/atmel/ac97c.c
··· 657 657 if (sr & AC97C_SR_CAEVT) { 658 658 struct snd_pcm_runtime *runtime; 659 659 int offset, next_period, block_size; 660 - dev_info(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n", 660 + dev_dbg(&chip->pdev->dev, "channel A event%s%s%s%s%s%s\n", 661 661 casr & AC97C_CSR_OVRUN ? " OVRUN" : "", 662 662 casr & AC97C_CSR_RXRDY ? " RXRDY" : "", 663 663 casr & AC97C_CSR_UNRUN ? " UNRUN" : "",
+3
sound/pci/hda/patch_realtek.c
··· 9477 9477 SND_PCI_QUIRK(0x106b, 0x2800, "AppleTV", ALC885_IMAC24), 9478 9478 SND_PCI_QUIRK(0x106b, 0x2c00, "MacbookPro rev3", ALC885_MBP3), 9479 9479 SND_PCI_QUIRK(0x106b, 0x3000, "iMac", ALC889A_MB31), 9480 + SND_PCI_QUIRK(0x106b, 0x3200, "iMac 7,1 Aluminum", ALC882_ASUS_A7M), 9481 + SND_PCI_QUIRK(0x106b, 0x3400, "MacBookAir 1,1", ALC885_MBP3), 9482 + SND_PCI_QUIRK(0x106b, 0x3500, "MacBookAir 2,1", ALC885_MBA21), 9480 9483 SND_PCI_QUIRK(0x106b, 0x3600, "Macbook 3,1", ALC889A_MB31), 9481 9484 SND_PCI_QUIRK(0x106b, 0x3800, "MacbookPro 4,1", ALC885_MBP3), 9482 9485 SND_PCI_QUIRK(0x106b, 0x3e00, "iMac 24 Aluminum", ALC885_IMAC24),
-1
sound/spi/at73c213.c
··· 69 69 int irq; 70 70 int period; 71 71 unsigned long bitrate; 72 - struct clk *bitclk; 73 72 struct ssc_device *ssc; 74 73 struct spi_device *spi; 75 74 u8 spi_wbuffer[2];