aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-11-03 10:51:26 -0400
committerTakashi Iwai <tiwai@suse.de>2010-11-03 10:51:26 -0400
commit69dbdd819599e2f3b77c172e83af512845bca5ad (patch)
tree49939d8b80ec2115a801eae2aebc21f23867c876 /sound/pci
parent87232dd49aeb6b7d1af291edca8bd129a82ef4b5 (diff)
parent75e3f3137cb570661c2ad3035a139dda671fbb63 (diff)
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/ens1370.c2
-rw-r--r--sound/pci/intel8x0.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/ens1370.c b/sound/pci/ens1370.c
index c7fba5379813..537cfba829a5 100644
--- a/sound/pci/ens1370.c
+++ b/sound/pci/ens1370.c
@@ -22,7 +22,7 @@
22/* Power-Management-Code ( CONFIG_PM ) 22/* Power-Management-Code ( CONFIG_PM )
23 * for ens1371 only ( FIXME ) 23 * for ens1371 only ( FIXME )
24 * derived from cs4281.c, atiixp.c and via82xx.c 24 * derived from cs4281.c, atiixp.c and via82xx.c
25 * using http://www.alsa-project.org/~iwai/writing-an-alsa-driver/c1540.htm 25 * using http://www.alsa-project.org/~tiwai/writing-an-alsa-driver/
26 * by Kurt J. Bosch 26 * by Kurt J. Bosch
27 */ 27 */
28 28
diff --git a/sound/pci/intel8x0.c b/sound/pci/intel8x0.c
index 467749249576..400f9ebd243e 100644
--- a/sound/pci/intel8x0.c
+++ b/sound/pci/intel8x0.c
@@ -716,7 +716,7 @@ static void snd_intel8x0_setup_periods(struct intel8x0 *chip, struct ichdev *ich
716 * Intel 82443MX running a 100MHz processor system bus has a hardware bug, 716 * Intel 82443MX running a 100MHz processor system bus has a hardware bug,
717 * which aborts PCI busmaster for audio transfer. A workaround is to set 717 * which aborts PCI busmaster for audio transfer. A workaround is to set
718 * the pages as non-cached. For details, see the errata in 718 * the pages as non-cached. For details, see the errata in
719 * http://www.intel.com/design/chipsets/specupdt/245051.htm 719 * http://download.intel.com/design/chipsets/specupdt/24505108.pdf
720 */ 720 */
721static void fill_nocache(void *buf, int size, int nocache) 721static void fill_nocache(void *buf, int size, int nocache)
722{ 722{