diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 12:38:52 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-29 12:38:52 -0400 |
| commit | 25a025863e024f6b86b48137b10b4960c50351b0 (patch) | |
| tree | 72d2521585f61d904769d28cf1d7687b949a61a6 /Documentation | |
| parent | 1f43c5393033de90bac4410352b1d2a69dcbe7ef (diff) | |
| parent | 7e48bf653c37eb32c2ba4c13f15aa154aa807e61 (diff) | |
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] soc - wm9712 - checkpatch fixes
[ALSA] pcsp - Fix more dependency
[ALSA] hda - Add support of Medion RIM 2150
[ALSA] ASoC: Add drivers for the Texas Instruments OMAP processors
[ALSA] ice1724 - Enable watermarks
[ALSA] Add MPU401_INFO_NO_ACK bitflag
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/sound/alsa/ALSA-Configuration.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/sound/alsa/ALSA-Configuration.txt b/Documentation/sound/alsa/ALSA-Configuration.txt index fd4c32a031c9..0bbee38acd26 100644 --- a/Documentation/sound/alsa/ALSA-Configuration.txt +++ b/Documentation/sound/alsa/ALSA-Configuration.txt | |||
| @@ -795,6 +795,7 @@ Prior to version 0.9.0rc4 options had a 'snd_' prefix. This was removed. | |||
| 795 | lg-lw LG LW20/LW25 laptop | 795 | lg-lw LG LW20/LW25 laptop |
| 796 | tcl TCL S700 | 796 | tcl TCL S700 |
| 797 | clevo Clevo laptops (m520G, m665n) | 797 | clevo Clevo laptops (m520G, m665n) |
| 798 | medion Medion Rim 2150 | ||
| 798 | test for testing/debugging purpose, almost all controls can be | 799 | test for testing/debugging purpose, almost all controls can be |
| 799 | adjusted. Appearing only when compiled with | 800 | adjusted. Appearing only when compiled with |
| 800 | $CONFIG_SND_DEBUG=y | 801 | $CONFIG_SND_DEBUG=y |