Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1f38e2c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 85ca7886 2d0a1dbf

sound/atmel/ac97c.c

+1 −1
Original line number Diff line number Diff line
@@ -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"   : "",

sound/pci/hda/patch_realtek.c

+3 −0
Original line number Diff line number Diff line
@@ -9477,6 +9477,9 @@ 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),

sound/spi/at73c213.c

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ struct snd_at73c213 { 
	int				irq;

	int				period;

	unsigned long			bitrate;

	struct clk			*bitclk;

	struct ssc_device		*ssc;

	struct spi_device		*spi;

	u8				spi_wbuffer[2];