diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-28 12:44:25 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-28 12:44:25 -0400 |
| commit | 521bd5e4d9e6eb7e3c76c615d650a2b5ad0f03f5 (patch) | |
| tree | 417d40b0d2fb101c82020b1a1b0c7e850f360ac5 /sound/pci/ctxfi | |
| parent | 6e8f7b09e403845330952f5f68be697fe35e6236 (diff) | |
| parent | 1a22e7758eabc431d6d8af085dc6e4c5031779a6 (diff) | |
Merge tag 'sound-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"Here contains not many exciting changes but just a few minor ones: An
off-by-one proc write fix, a couple of trivial incldue guard fixes,
Acer laptop pinconfig fix, and a fix for DSD formats that are still
rarely used"
* tag 'sound-3.17-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ALSA: hda - Set up initial pins for Acer Aspire V5
ALSA: pcm: Fix the silence data for DSD formats
ALSA: ctxfi: ct20k1reg: Fix typo in include guard
ALSA: hda: ca0132_regs.h: Fix typo in include guard
ALSA: core: fix buffer overflow in snd_info_get_line()
Diffstat (limited to 'sound/pci/ctxfi')
| -rw-r--r-- | sound/pci/ctxfi/ct20k1reg.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sound/pci/ctxfi/ct20k1reg.h b/sound/pci/ctxfi/ct20k1reg.h index f2e34e3f27ee..5851249f11d9 100644 --- a/sound/pci/ctxfi/ct20k1reg.h +++ b/sound/pci/ctxfi/ct20k1reg.h | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | */ | 7 | */ |
| 8 | 8 | ||
| 9 | #ifndef CT20K1REG_H | 9 | #ifndef CT20K1REG_H |
| 10 | #define CT20k1REG_H | 10 | #define CT20K1REG_H |
| 11 | 11 | ||
| 12 | /* 20k1 registers */ | 12 | /* 20k1 registers */ |
| 13 | #define DSPXRAM_START 0x000000 | 13 | #define DSPXRAM_START 0x000000 |
| @@ -632,5 +632,3 @@ | |||
| 632 | #define I2SD_R 0x19L | 632 | #define I2SD_R 0x19L |
| 633 | 633 | ||
| 634 | #endif /* CT20K1REG_H */ | 634 | #endif /* CT20K1REG_H */ |
| 635 | |||
| 636 | |||