diff options
Diffstat (limited to 'sound')
-rw-r--r-- | sound/core/Kconfig | 2 | ||||
-rw-r--r-- | sound/oss/es1371.c | 2 | ||||
-rw-r--r-- | sound/oss/pas2_pcm.c | 2 | ||||
-rw-r--r-- | sound/oss/trident.c | 4 | ||||
-rw-r--r-- | sound/pci/ac97/ac97_codec.c | 2 | ||||
-rw-r--r-- | sound/pci/ice1712/delta.h | 4 | ||||
-rw-r--r-- | sound/pci/mixart/mixart.c | 2 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-ac97.h | 2 | ||||
-rw-r--r-- | sound/soc/pxa/pxa2xx-i2s.h | 2 | ||||
-rw-r--r-- | sound/sparc/dbri.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/sound/core/Kconfig b/sound/core/Kconfig index b2927523d79d..829ca38b595e 100644 --- a/sound/core/Kconfig +++ b/sound/core/Kconfig | |||
@@ -146,7 +146,7 @@ config SND_VERBOSE_PROCFS | |||
146 | default y | 146 | default y |
147 | help | 147 | help |
148 | Say Y here to include code for verbose procfs contents (provides | 148 | Say Y here to include code for verbose procfs contents (provides |
149 | usefull information to developers when a problem occurs). On the | 149 | useful information to developers when a problem occurs). On the |
150 | other side, it makes the ALSA subsystem larger. | 150 | other side, it makes the ALSA subsystem larger. |
151 | 151 | ||
152 | config SND_VERBOSE_PRINTK | 152 | config SND_VERBOSE_PRINTK |
diff --git a/sound/oss/es1371.c b/sound/oss/es1371.c index 974dd732b149..593a3aac12ce 100644 --- a/sound/oss/es1371.c +++ b/sound/oss/es1371.c | |||
@@ -100,7 +100,7 @@ | |||
100 | * Tjeerd Mulder <tjeerd.mulder@fujitsu-siemens.com> | 100 | * Tjeerd Mulder <tjeerd.mulder@fujitsu-siemens.com> |
101 | * 05.01.2001 0.29 Hopefully updates will not be required anymore when Creative bumps | 101 | * 05.01.2001 0.29 Hopefully updates will not be required anymore when Creative bumps |
102 | * the CT5880 revision. | 102 | * the CT5880 revision. |
103 | * suggested by Stephan Müller <smueller@chronox.de> | 103 | * suggested by Stephan Müller <smueller@chronox.de> |
104 | * 31.01.2001 0.30 Register/Unregister gameport | 104 | * 31.01.2001 0.30 Register/Unregister gameport |
105 | * Fix SETTRIGGER non OSS API conformity | 105 | * Fix SETTRIGGER non OSS API conformity |
106 | * 14.07.2001 0.31 Add list of laptops needing amplifier control | 106 | * 14.07.2001 0.31 Add list of laptops needing amplifier control |
diff --git a/sound/oss/pas2_pcm.c b/sound/oss/pas2_pcm.c index 4af6aafa3d86..36c3ea62086b 100644 --- a/sound/oss/pas2_pcm.c +++ b/sound/oss/pas2_pcm.c | |||
@@ -85,7 +85,7 @@ static int pcm_set_speed(int arg) | |||
85 | * come from the SDK found on ftp.uwp.edu:/pub/msdos/proaudio/. | 85 | * come from the SDK found on ftp.uwp.edu:/pub/msdos/proaudio/. |
86 | * | 86 | * |
87 | * I cleared bit 5 of these values, since that bit controls the master | 87 | * I cleared bit 5 of these values, since that bit controls the master |
88 | * mute flag. (Olav Wölfelschneider) | 88 | * mute flag. (Olav Wölfelschneider) |
89 | * | 89 | * |
90 | */ | 90 | */ |
91 | #if !defined NO_AUTO_FILTER_SET | 91 | #if !defined NO_AUTO_FILTER_SET |
diff --git a/sound/oss/trident.c b/sound/oss/trident.c index d98d311542ed..3bc1f6e9e4a3 100644 --- a/sound/oss/trident.c +++ b/sound/oss/trident.c | |||
@@ -18,7 +18,7 @@ | |||
18 | * Ollie Lho <ollie@sis.com.tw> SiS 7018 Audio Core Support | 18 | * Ollie Lho <ollie@sis.com.tw> SiS 7018 Audio Core Support |
19 | * Ching-Ling Lee <cling-li@ali.com.tw> ALi 5451 Audio Core Support | 19 | * Ching-Ling Lee <cling-li@ali.com.tw> ALi 5451 Audio Core Support |
20 | * Matt Wu <mattwu@acersoftech.com.cn> ALi 5451 Audio Core Support | 20 | * Matt Wu <mattwu@acersoftech.com.cn> ALi 5451 Audio Core Support |
21 | * Peter Wächtler <pwaechtler@loewe-komp.de> CyberPro5050 support | 21 | * Peter Wächtler <pwaechtler@loewe-komp.de> CyberPro5050 support |
22 | * Muli Ben-Yehuda <mulix@mulix.org> | 22 | * Muli Ben-Yehuda <mulix@mulix.org> |
23 | * | 23 | * |
24 | * | 24 | * |
@@ -89,7 +89,7 @@ | |||
89 | * use set_current_state, properly release resources on failure in | 89 | * use set_current_state, properly release resources on failure in |
90 | * trident_probe, get rid of check_region | 90 | * trident_probe, get rid of check_region |
91 | * v0.14.9c | 91 | * v0.14.9c |
92 | * August 10 2001 Peter Wächtler <pwaechtler@loewe-komp.de> | 92 | * August 10 2001 Peter Wächtler <pwaechtler@loewe-komp.de> |
93 | * added support for Tvia (formerly Integraphics/IGST) CyberPro5050 | 93 | * added support for Tvia (formerly Integraphics/IGST) CyberPro5050 |
94 | * this chip is often found in settop boxes (combined video+audio) | 94 | * this chip is often found in settop boxes (combined video+audio) |
95 | * v0.14.9b | 95 | * v0.14.9b |
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c index a9eec2a2357d..3bfb2102fc5d 100644 --- a/sound/pci/ac97/ac97_codec.c +++ b/sound/pci/ac97/ac97_codec.c | |||
@@ -1083,7 +1083,7 @@ static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned cha | |||
1083 | unsigned short val; | 1083 | unsigned short val; |
1084 | snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] << 8)); | 1084 | snd_ac97_write(ac97, reg, 0x8080 | cbit[i] | (cbit[i] << 8)); |
1085 | /* Do the read twice due to buffers on some ac97 codecs. | 1085 | /* Do the read twice due to buffers on some ac97 codecs. |
1086 | * e.g. The STAC9704 returns exactly what you wrote the the register | 1086 | * e.g. The STAC9704 returns exactly what you wrote to the register |
1087 | * if you read it immediately. This causes the detect routine to fail. | 1087 | * if you read it immediately. This causes the detect routine to fail. |
1088 | */ | 1088 | */ |
1089 | val = snd_ac97_read(ac97, reg); | 1089 | val = snd_ac97_read(ac97, reg); |
diff --git a/sound/pci/ice1712/delta.h b/sound/pci/ice1712/delta.h index e65d669af639..e47861ccd6e7 100644 --- a/sound/pci/ice1712/delta.h +++ b/sound/pci/ice1712/delta.h | |||
@@ -63,7 +63,7 @@ extern const struct snd_ice1712_card_info snd_ice1712_delta_cards[]; | |||
63 | /* look to CS8414 datasheet */ | 63 | /* look to CS8414 datasheet */ |
64 | #define ICE1712_DELTA_SPDIF_OUT_STAT_CLOCK 0x04 | 64 | #define ICE1712_DELTA_SPDIF_OUT_STAT_CLOCK 0x04 |
65 | /* S/PDIF output status clock */ | 65 | /* S/PDIF output status clock */ |
66 | /* (writting on rising edge - 0->1) */ | 66 | /* (writing on rising edge - 0->1) */ |
67 | /* all except Delta44 */ | 67 | /* all except Delta44 */ |
68 | /* look to CS8404A datasheet */ | 68 | /* look to CS8404A datasheet */ |
69 | #define ICE1712_DELTA_SPDIF_OUT_STAT_DATA 0x08 | 69 | #define ICE1712_DELTA_SPDIF_OUT_STAT_DATA 0x08 |
@@ -100,7 +100,7 @@ extern const struct snd_ice1712_card_info snd_ice1712_delta_cards[]; | |||
100 | /* AKM4524 serial data */ | 100 | /* AKM4524 serial data */ |
101 | #define ICE1712_DELTA_CODEC_SERIAL_CLOCK 0x20 | 101 | #define ICE1712_DELTA_CODEC_SERIAL_CLOCK 0x20 |
102 | /* AKM4524 serial clock */ | 102 | /* AKM4524 serial clock */ |
103 | /* (writting on rising edge - 0->1 */ | 103 | /* (writing on rising edge - 0->1 */ |
104 | #define ICE1712_DELTA_CODEC_CHIP_A 0x40 | 104 | #define ICE1712_DELTA_CODEC_CHIP_A 0x40 |
105 | #define ICE1712_DELTA_CODEC_CHIP_B 0x80 | 105 | #define ICE1712_DELTA_CODEC_CHIP_B 0x80 |
106 | /* 1 - select chip A or B */ | 106 | /* 1 - select chip A or B */ |
diff --git a/sound/pci/mixart/mixart.c b/sound/pci/mixart/mixart.c index 21386da3bc86..ac007cec0879 100644 --- a/sound/pci/mixart/mixart.c +++ b/sound/pci/mixart/mixart.c | |||
@@ -472,7 +472,7 @@ static int snd_mixart_prepare(struct snd_pcm_substream *subs) | |||
472 | struct snd_mixart *chip = snd_pcm_substream_chip(subs); | 472 | struct snd_mixart *chip = snd_pcm_substream_chip(subs); |
473 | struct mixart_stream *stream = subs->runtime->private_data; | 473 | struct mixart_stream *stream = subs->runtime->private_data; |
474 | 474 | ||
475 | /* TODO de façon non bloquante, réappliquer les hw_params (rate, bits, codec) */ | 475 | /* TODO de façon non bloquante, réappliquer les hw_params (rate, bits, codec) */ |
476 | 476 | ||
477 | snd_printdd("snd_mixart_prepare\n"); | 477 | snd_printdd("snd_mixart_prepare\n"); |
478 | 478 | ||
diff --git a/sound/soc/pxa/pxa2xx-ac97.h b/sound/soc/pxa/pxa2xx-ac97.h index 4c4b882316ac..b8ccfee095c4 100644 --- a/sound/soc/pxa/pxa2xx-ac97.h +++ b/sound/soc/pxa/pxa2xx-ac97.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/sound/arm/pxa2xx-ac97.h | 2 | * linux/sound/soc/pxa/pxa2xx-ac97.h |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
diff --git a/sound/soc/pxa/pxa2xx-i2s.h b/sound/soc/pxa/pxa2xx-i2s.h index a2484f0881f1..4435bd9f884f 100644 --- a/sound/soc/pxa/pxa2xx-i2s.h +++ b/sound/soc/pxa/pxa2xx-i2s.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * linux/sound/arm/pxa2xx-i2s.h | 2 | * linux/sound/soc/pxa/pxa2xx-i2s.h |
3 | * | 3 | * |
4 | * This program is free software; you can redistribute it and/or modify | 4 | * This program is free software; you can redistribute it and/or modify |
5 | * it under the terms of the GNU General Public License version 2 as | 5 | * it under the terms of the GNU General Public License version 2 as |
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c index 25a2a7333006..e07085a7cfc3 100644 --- a/sound/sparc/dbri.c +++ b/sound/sparc/dbri.c | |||
@@ -673,7 +673,7 @@ static s32 *dbri_cmdlock(struct snd_dbri * dbri, int len) | |||
673 | } | 673 | } |
674 | 674 | ||
675 | /* | 675 | /* |
676 | * Send prepared cmd string. It works by writting a JUMP cmd into | 676 | * Send prepared cmd string. It works by writing a JUMP cmd into |
677 | * the last WAIT cmd and force DBRI to reread the cmd. | 677 | * the last WAIT cmd and force DBRI to reread the cmd. |
678 | * The JUMP cmd points to the new cmd string. | 678 | * The JUMP cmd points to the new cmd string. |
679 | * It also releases the cmdlock spinlock. | 679 | * It also releases the cmdlock spinlock. |