diff options
author | Linus Torvalds | 2006-10-03 16:35:11 -0700 |
---|---|---|
committer | Linus Torvalds | 2006-10-03 16:35:11 -0700 |
commit | 708e16892e1646594a29eaa7ac7b209b600b9fd2 (patch) | |
tree | fe7c31bc0edef84eb1075c7e195340047d6aaa17 /sound/oss | |
parent | f3c87a8999c28f2948ebd407574f7e9fb5c577b2 (diff) | |
parent | a847825970e741e20a09c659978baa34016b63bc (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
* git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial: (39 commits)
Add missing maintainer countries in CREDITS
Fix bytes <-> kilobytes typo in Kconfig for ramdisk
fix a typo in Documentation/pi-futex.txt
BUG_ON conversion for fs/xfs/
BUG_ON() conversion in fs/nfsd/
BUG_ON conversion for fs/reiserfs
BUG_ON cleanups in arch/i386
BUG_ON cleanup in drivers/net/tokenring/
BUG_ON cleanup for drivers/md/
kerneldoc-typo in led-class.c
debugfs: spelling fix
rcutorture: Fix incorrect description of default for nreaders parameter
parport: Remove space in function calls
Michal Wronski: update contact info
Spelling fix: "control" instead of "cotrol"
reboot parameter in Documentation/kernel-parameters.txt
Fix copy&waste bug in comment in scripts/kernel-doc
remove duplicate "until" from kernel/workqueue.c
ite_gpio fix tabbage
fix file specification in comments
...
Fixed trivial path conflicts due to removed files:
arch/mips/dec/boot/decstation.c, drivers/char/ite_gpio.c
Diffstat (limited to 'sound/oss')
45 files changed, 45 insertions, 45 deletions
diff --git a/sound/oss/Kconfig b/sound/oss/Kconfig index f3b3530402cb..cc2b9ab7f4e5 100644 --- a/sound/oss/Kconfig +++ b/sound/oss/Kconfig @@ -643,7 +643,7 @@ config SOUND_PSS command line. config PSS_MIXER - bool "Enable PSS mixer (Beethoven ADSP-16 and other compatibile)" + bool "Enable PSS mixer (Beethoven ADSP-16 and other compatible)" depends on SOUND_PSS help Answer Y for Beethoven ADSP-16. You may try to say Y also for other diff --git a/sound/oss/ad1848.c b/sound/oss/ad1848.c index 3b45e11e5303..f6b6b886c2ad 100644 --- a/sound/oss/ad1848.c +++ b/sound/oss/ad1848.c @@ -1,5 +1,5 @@ /* - * sound/ad1848.c + * sound/oss/ad1848.c * * The low level driver for the AD1848/CS4248 codec chip which * is used for example in the MS Sound System. diff --git a/sound/oss/ad1848_mixer.h b/sound/oss/ad1848_mixer.h index f9231c6cd4e1..2cf719b5fbbc 100644 --- a/sound/oss/ad1848_mixer.h +++ b/sound/oss/ad1848_mixer.h @@ -1,5 +1,5 @@ /* - * sound/ad1848_mixer.h + * sound/oss/ad1848_mixer.h * * Definitions for the mixer of AD1848 and compatible codecs. */ diff --git a/sound/oss/adlib_card.c b/sound/oss/adlib_card.c index 6414ceb8f072..c9a7c9b470de 100644 --- a/sound/oss/adlib_card.c +++ b/sound/oss/adlib_card.c @@ -1,5 +1,5 @@ /* - * sound/adlib_card.c + * sound/oss/adlib_card.c * * Detection routine for the AdLib card. * diff --git a/sound/oss/audio.c b/sound/oss/audio.c index 22dd63c36816..89bd27a5e865 100644 --- a/sound/oss/audio.c +++ b/sound/oss/audio.c @@ -1,5 +1,5 @@ /* - * sound/audio.c + * sound/oss/audio.c * * Device file manager for /dev/audio */ diff --git a/sound/oss/awe_hw.h b/sound/oss/awe_hw.h index 7e403ad68152..ab00c3c67e4e 100644 --- a/sound/oss/awe_hw.h +++ b/sound/oss/awe_hw.h @@ -1,5 +1,5 @@ /* - * sound/awe_hw.h + * sound/oss/awe_hw.h * * Access routines and definitions for the low level driver for the * Creative AWE32/SB32/AWE64 wave table synth. diff --git a/sound/oss/awe_wave.c b/sound/oss/awe_wave.c index d1a0eb294d6f..01c592cee045 100644 --- a/sound/oss/awe_wave.c +++ b/sound/oss/awe_wave.c @@ -1,5 +1,5 @@ /* - * sound/awe_wave.c + * sound/oss/awe_wave.c * * The low level driver for the AWE32/SB32/AWE64 wave table synth. * version 0.4.4; Jan. 4, 2000 diff --git a/sound/oss/awe_wave.h b/sound/oss/awe_wave.h index a3aa018118bd..fe584810608f 100644 --- a/sound/oss/awe_wave.h +++ b/sound/oss/awe_wave.h @@ -1,5 +1,5 @@ /* - * sound/awe_config.h + * sound/oss/awe_wave.h * * Configuration of AWE32/SB32/AWE64 wave table synth driver. * version 0.4.4; Jan. 4, 2000 diff --git a/sound/oss/dev_table.c b/sound/oss/dev_table.c index f65a90469d8a..fb64279f3935 100644 --- a/sound/oss/dev_table.c +++ b/sound/oss/dev_table.c @@ -1,5 +1,5 @@ /* - * sound/dev_table.c + * sound/oss/dev_table.c * * Device call tables. * diff --git a/sound/oss/dmabuf.c b/sound/oss/dmabuf.c index 15ce7119c5f4..6c1cf74b78c5 100644 --- a/sound/oss/dmabuf.c +++ b/sound/oss/dmabuf.c @@ -1,5 +1,5 @@ /* - * sound/dmabuf.c + * sound/oss/dmabuf.c * * The DMA buffer manager for digitized voice applications */ diff --git a/sound/oss/gus_card.c b/sound/oss/gus_card.c index dbb29771e2bb..a3d6ae33fe8b 100644 --- a/sound/oss/gus_card.c +++ b/sound/oss/gus_card.c @@ -1,5 +1,5 @@ /* - * sound/gus_card.c + * sound/oss/gus_card.c * * Detection routine for the Gravis Ultrasound. * diff --git a/sound/oss/gus_midi.c b/sound/oss/gus_midi.c index b48f57c24e48..d1997a417ad0 100644 --- a/sound/oss/gus_midi.c +++ b/sound/oss/gus_midi.c @@ -1,5 +1,5 @@ /* - * sound/gus2_midi.c + * sound/oss/gus_midi.c * * The low level driver for the GUS Midi Interface. * diff --git a/sound/oss/gus_wave.c b/sound/oss/gus_wave.c index 942d5186580d..597db7aee632 100644 --- a/sound/oss/gus_wave.c +++ b/sound/oss/gus_wave.c @@ -1,5 +1,5 @@ /* - * sound/gus_wave.c + * sound/oss/gus_wave.c * * Driver for the Gravis UltraSound wave table synth. * diff --git a/sound/oss/harmony.c b/sound/oss/harmony.c index 591683c55f27..6601b284f03a 100644 --- a/sound/oss/harmony.c +++ b/sound/oss/harmony.c @@ -1,5 +1,5 @@ /* - drivers/sound/harmony.c + sound/oss/harmony.c This is a sound driver for ASP's and Lasi's Harmony sound chip and is unlikely to be used for anything other than on a HP PA-RISC. diff --git a/sound/oss/ics2101.c b/sound/oss/ics2101.c index d5f3be8550f3..45918df150b3 100644 --- a/sound/oss/ics2101.c +++ b/sound/oss/ics2101.c @@ -1,5 +1,5 @@ /* - * sound/ics2101.c + * sound/oss/ics2101.c * * Driver for the ICS2101 mixer of GUS v3.7. * diff --git a/sound/oss/iwmem.h b/sound/oss/iwmem.h index 84745fbcabcb..48d333c7302b 100644 --- a/sound/oss/iwmem.h +++ b/sound/oss/iwmem.h @@ -1,5 +1,5 @@ /* - * sound/iwmem.h + * sound/oss/iwmem.h * * DRAM size encoding table for AMD Interwave chip. */ diff --git a/sound/oss/maui.c b/sound/oss/maui.c index 05cf194eda6b..317f22589a05 100644 --- a/sound/oss/maui.c +++ b/sound/oss/maui.c @@ -1,5 +1,5 @@ /* - * sound/maui.c + * sound/oss/maui.c * * The low level driver for Turtle Beach Maui and Tropez. * diff --git a/sound/oss/midi_synth.c b/sound/oss/midi_synth.c index 972edc62afd1..d2ab5c08b616 100644 --- a/sound/oss/midi_synth.c +++ b/sound/oss/midi_synth.c @@ -1,5 +1,5 @@ /* - * sound/midi_synth.c + * sound/oss/midi_synth.c * * High level midi sequencer manager for dumb MIDI interfaces. */ diff --git a/sound/oss/midibuf.c b/sound/oss/midibuf.c index 6982556ded56..c0e4bbc22c80 100644 --- a/sound/oss/midibuf.c +++ b/sound/oss/midibuf.c @@ -1,5 +1,5 @@ /* - * sound/midibuf.c + * sound/oss/midibuf.c * * Device file manager for /dev/midi# */ diff --git a/sound/oss/mpu401.c b/sound/oss/mpu401.c index 0aac54c68f01..321f4c4b5a7b 100644 --- a/sound/oss/mpu401.c +++ b/sound/oss/mpu401.c @@ -1,5 +1,5 @@ /* - * sound/mpu401.c + * sound/oss/mpu401.c * * The low level driver for Roland MPU-401 compatible Midi cards. */ diff --git a/sound/oss/opl3.c b/sound/oss/opl3.c index a31734b7842f..4799bc77f987 100644 --- a/sound/oss/opl3.c +++ b/sound/oss/opl3.c @@ -1,5 +1,5 @@ /* - * sound/opl3.c + * sound/oss/opl3.c * * A low level driver for Yamaha YM3812 and OPL-3 -chips * diff --git a/sound/oss/opl3sa.c b/sound/oss/opl3sa.c index fe4907c6e8fc..2535ed0b5fbf 100644 --- a/sound/oss/opl3sa.c +++ b/sound/oss/opl3sa.c @@ -1,5 +1,5 @@ /* - * sound/opl3sa.c + * sound/oss/opl3sa.c * * Low level driver for Yamaha YMF701B aka OPL3-SA chip * diff --git a/sound/oss/opl3sa2.c b/sound/oss/opl3sa2.c index aec05a2bfc87..e20051f1be4d 100644 --- a/sound/oss/opl3sa2.c +++ b/sound/oss/opl3sa2.c @@ -1,5 +1,5 @@ /* - * sound/opl3sa2.c + * sound/oss/opl3sa2.c * * A low level driver for Yamaha OPL3-SA2 and SA3 cards. * NOTE: All traces of the name OPL3-SAx have now (December 2000) been diff --git a/sound/oss/pas2_card.c b/sound/oss/pas2_card.c index 97666007b274..4ebb9638746e 100644 --- a/sound/oss/pas2_card.c +++ b/sound/oss/pas2_card.c @@ -1,5 +1,5 @@ /* - * sound/pas2_card.c + * sound/oss/pas2_card.c * * Detection routine for the Pro Audio Spectrum cards. */ diff --git a/sound/oss/pas2_midi.c b/sound/oss/pas2_midi.c index 79d6a5827b6d..1122d10a20c3 100644 --- a/sound/oss/pas2_midi.c +++ b/sound/oss/pas2_midi.c @@ -1,5 +1,5 @@ /* - * sound/pas2_midi.c + * sound/oss/pas2_midi.c * * The low level driver for the PAS Midi Interface. */ diff --git a/sound/oss/pas2_mixer.c b/sound/oss/pas2_mixer.c index 4aade5304587..a0bcb85c3904 100644 --- a/sound/oss/pas2_mixer.c +++ b/sound/oss/pas2_mixer.c @@ -1,6 +1,6 @@ /* - * sound/pas2_mixer.c + * sound/oss/pas2_mixer.c * * Mixer routines for the Pro Audio Spectrum cards. */ diff --git a/sound/oss/pss.c b/sound/oss/pss.c index 37ee234b587c..ece428b2ba9f 100644 --- a/sound/oss/pss.c +++ b/sound/oss/pss.c @@ -1,5 +1,5 @@ /* - * sound/pss.c + * sound/oss/pss.c * * The low level driver for the Personal Sound System (ECHO ESC614). * diff --git a/sound/oss/sb_audio.c b/sound/oss/sb_audio.c index 75e54f6f638a..733b014ec7d1 100644 --- a/sound/oss/sb_audio.c +++ b/sound/oss/sb_audio.c @@ -1,5 +1,5 @@ /* - * sound/sb_audio.c + * sound/oss/sb_audio.c * * Audio routines for Sound Blaster compatible cards. * diff --git a/sound/oss/sb_common.c b/sound/oss/sb_common.c index 35bab6e2f998..bbe5b7596d0e 100644 --- a/sound/oss/sb_common.c +++ b/sound/oss/sb_common.c @@ -1,5 +1,5 @@ /* - * sound/sb_common.c + * sound/oss/sb_common.c * * Common routines for Sound Blaster compatible cards. * diff --git a/sound/oss/sb_midi.c b/sound/oss/sb_midi.c index ed3bd0640ffd..2e3bc045caba 100644 --- a/sound/oss/sb_midi.c +++ b/sound/oss/sb_midi.c @@ -1,5 +1,5 @@ /* - * sound/sb_dsp.c + * sound/oss/sb_midi.c * * The low level driver for the Sound Blaster DS chips. * diff --git a/sound/oss/sb_mixer.c b/sound/oss/sb_mixer.c index ccb21d48d42c..238e2cf44b08 100644 --- a/sound/oss/sb_mixer.c +++ b/sound/oss/sb_mixer.c @@ -1,5 +1,5 @@ /* - * sound/sb_mixer.c + * sound/oss/sb_mixer.c * * The low level mixer driver for the Sound Blaster compatible cards. */ diff --git a/sound/oss/sb_mixer.h b/sound/oss/sb_mixer.h index ab74426157ba..4b9425f085e3 100644 --- a/sound/oss/sb_mixer.h +++ b/sound/oss/sb_mixer.h @@ -1,5 +1,5 @@ /* - * sound/sb_mixer.h + * sound/oss/sb_mixer.h * * Definitions for the SB Pro and SB16 mixers */ diff --git a/sound/oss/sequencer.c b/sound/oss/sequencer.c index 6815c30e0bc1..0ce4e4ef6fe9 100644 --- a/sound/oss/sequencer.c +++ b/sound/oss/sequencer.c @@ -1,5 +1,5 @@ /* - * sound/sequencer.c + * sound/oss/sequencer.c * * The sequencer personality manager. */ diff --git a/sound/oss/sgalaxy.c b/sound/oss/sgalaxy.c index 3f32d4674371..0bcff6735319 100644 --- a/sound/oss/sgalaxy.c +++ b/sound/oss/sgalaxy.c @@ -1,5 +1,5 @@ /* - * sound/sgalaxy.c + * sound/oss/sgalaxy.c * * Low level driver for Aztech Sound Galaxy cards. * Copyright 1998 Artur Skawina <skawina@geocities.com> diff --git a/sound/oss/sound_timer.c b/sound/oss/sound_timer.c index bc2777dd2ef9..146bf85de958 100644 --- a/sound/oss/sound_timer.c +++ b/sound/oss/sound_timer.c @@ -1,5 +1,5 @@ /* - * sound/sound_timer.c + * sound/oss/sound_timer.c */ /* * Copyright (C) by Hannu Savolainen 1993-1997 diff --git a/sound/oss/soundcard.c b/sound/oss/soundcard.c index 0860d6789715..683dc00a8d2b 100644 --- a/sound/oss/soundcard.c +++ b/sound/oss/soundcard.c @@ -1,5 +1,5 @@ /* - * linux/drivers/sound/soundcard.c + * linux/sound/oss/soundcard.c * * Sound card driver for Linux * diff --git a/sound/oss/sscape.c b/sound/oss/sscape.c index 9ed5211c3168..51f2fa615413 100644 --- a/sound/oss/sscape.c +++ b/sound/oss/sscape.c @@ -1,5 +1,5 @@ /* - * sound/sscape.c + * sound/oss/sscape.c * * Low level driver for Ensoniq SoundScape * diff --git a/sound/oss/sys_timer.c b/sound/oss/sys_timer.c index c9d04518b172..107534477a2f 100644 --- a/sound/oss/sys_timer.c +++ b/sound/oss/sys_timer.c @@ -1,5 +1,5 @@ /* - * sound/sys_timer.c + * sound/oss/sys_timer.c * * The default timer for the Level 2 sequencer interface * Uses the (1/HZ sec) timer of kernel. diff --git a/sound/oss/trix.c b/sound/oss/trix.c index d1f1f154dcce..e04169e8e3f8 100644 --- a/sound/oss/trix.c +++ b/sound/oss/trix.c @@ -1,5 +1,5 @@ /* - * sound/trix.c + * sound/oss/trix.c * * Low level driver for the MediaTrix AudioTrix Pro * (MT-0002-PC Control Chip) diff --git a/sound/oss/uart401.c b/sound/oss/uart401.c index a3d75baf6df8..8e18b6e25818 100644 --- a/sound/oss/uart401.c +++ b/sound/oss/uart401.c @@ -1,5 +1,5 @@ /* - * sound/uart401.c + * sound/oss/uart401.c * * MPU-401 UART driver (formerly uart401_midi.c) * diff --git a/sound/oss/uart6850.c b/sound/oss/uart6850.c index 74ae75f9e2dc..501d3e654a67 100644 --- a/sound/oss/uart6850.c +++ b/sound/oss/uart6850.c @@ -1,5 +1,5 @@ /* - * sound/uart6850.c + * sound/oss/uart6850.c * * * Copyright (C) by Hannu Savolainen 1993-1997 diff --git a/sound/oss/v_midi.c b/sound/oss/v_midi.c index a7ef04fab075..d952b2264da1 100644 --- a/sound/oss/v_midi.c +++ b/sound/oss/v_midi.c @@ -1,5 +1,5 @@ /* - * sound/v_midi.c + * sound/oss/v_midi.c * * The low level driver for the Sound Blaster DS chips. * diff --git a/sound/oss/waveartist.c b/sound/oss/waveartist.c index 22d26624b34a..59a2f28eb5a5 100644 --- a/sound/oss/waveartist.c +++ b/sound/oss/waveartist.c @@ -1,5 +1,5 @@ /* - * linux/drivers/sound/waveartist.c + * linux/sound/oss/waveartist.c * * The low level driver for the RWA010 Rockwell Wave Artist * codec chip used in the Rebel.com NetWinder. diff --git a/sound/oss/waveartist.h b/sound/oss/waveartist.h index 2033fb87b247..dac4ca910d95 100644 --- a/sound/oss/waveartist.h +++ b/sound/oss/waveartist.h @@ -1,5 +1,5 @@ /* - * linux/drivers/sound/waveartist.h + * linux/sound/oss/waveartist.h * * def file for Rockwell RWA010 chip set, as installed in Rebel.com NetWinder */ diff --git a/sound/oss/wf_midi.c b/sound/oss/wf_midi.c index 3f3a390014ca..75c0c143a759 100644 --- a/sound/oss/wf_midi.c +++ b/sound/oss/wf_midi.c @@ -1,5 +1,5 @@ /* - * sound/wf_midi.c + * sound/oss/wf_midi.c * * The low level driver for the WaveFront ICS2115 MIDI interface(s) * Note that there is also an MPU-401 emulation (actually, a UART-401 |