summaryrefslogtreecommitdiffstats
path: root/sound
Commit message (Collapse)AuthorAgeFilesLines
* [PATCH] Prevent trident driver from grabbing pcnet32 hardwareJon Mason2006-01-181-10/+8
| | | | | | | | | | | | | | | | Some pcnet32 hardware erroneously has the Vendor ID for Trident. The pcnet32 driver looks for the PCI ethernet class before grabbing the hardware, but the current trident driver does not check against the PCI audio class. This allows the trident driver to claim the pcnet32 hardware. This patch prevents that. This revised version of the OSS Trident patch includes PCI_DEVICE Macro usage. Signed-off-by: Jon Mason <jdmason@us.ibm.com> Signed-off-by: Muli Ben-Yehuda <mulix@mulix.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [SOUND]: sparc/cs4231: Fix some typos which wrecked the build.David S. Miller2006-01-171-1/+2
| | | | Signed-off-by: David S. Miller <davem@davemloft.net>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivialLinus Torvalds2006-01-151-1/+1
|\
| * spelling: s/appropiate/appropriate/Adrian Bunk2006-01-151-1/+1
| | | | | | | | Signed-off-by: Adrian Bunk <bunk@stusta.de>
* | [PATCH] Unlinline a bunch of other functionsArjan van de Ven2006-01-142-3/+3
|/ | | | | | | | | | | Remove the "inline" keyword from a bunch of big functions in the kernel with the goal of shrinking it by 30kb to 40kb Signed-off-by: Arjan van de Ven <arjan@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu> Acked-by: Jeff Garzik <jgarzik@pobox.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68k: dmasound __user annotationsAl Viro2006-01-123-60/+60
| | | | | | | Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68k: compile fixes for dmasound (static vs. extern)Al Viro2006-01-122-1/+1
| | | | | | | | | | | | | | | sound/oss/dmasound/dmasound_atari.c has static expand_bal sound/oss/dmasound/dmasound_q40.c has static expand_bal sound/oss/dmasound/dmasound_awacs.c has non-static expand_bal sound/oss/dmasound/trans_16.c uses expand_bal from dmasound_awacs.c all 4 include dmasound.h; extern for expand_bal used to be there, which is a bloody bad idea, considering _atari and _q40. Moved the extern to trans_16.c. Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68k: lvalues abuse in dmasoundAl Viro2006-01-121-18/+36
| | | | | | | | | Cast is not an lvalue Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68k: dmasound_paula.c lvalues abuse (from m68k CVS)Al Viro2006-01-121-3/+4
| | | | | | | | | | Avoid warnings about use of cast expressions as lvalues Signed-off-by: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] m68k: namespace pollution fix (custom->amiga_custom)Al Viro2006-01-121-0/+1
| | | | | | | | | | in amigahw.h custom renamed to amiga_custom, in drivers with few instances the same replacement, in the rest - #define custom amiga_custom in driver itself Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Cc: Roman Zippel <zippel@linux-m68k.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] x86_64: Enable sound in old style OSS driver for NForce4 CK804Andi Kleen2006-01-111-1/+2
| | | | | | | | | | Just add the missing PCI ID. Cc: perex@suse.cz Cc: tiwai@suse.de Signed-off-by: Andi Kleen <ak@suse.de> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] move capable() to capability.hRandy.Dunlap2006-01-111-0/+1
| | | | | | | | | | | | | - Move capable() from sched.h to capability.h; - Use <linux/capability.h> where capable() is used (in include/, block/, ipc/, kernel/, a few drivers/, mm/, security/, & sound/; many more drivers/ to go) Signed-off-by: Randy Dunlap <rdunlap@xenotime.net> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PATCH] remove unused out_pio label in i810_audioJesper Juhl2006-01-111-1/+0
| | | | | | | | sound/oss/i810_audio.c:3431: warning: label `out_pio' defined but not used Signed-off-by: Jesper Juhl <jesper.juhl@gmail.com Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* [PARISC] OSS: Fix build of parisc harmony driverStuart Brady2006-01-101-2/+2
| | | | | | | | OSS Harmony got missed on the conversion of parisc_device.hpa to a struct resource... fix its build. Signed-off-by: Stuart Brady <sdb@parisc-linux.org> Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
* [PATCH] i386: GPIO driver for AMD CS5535/CS5536Ben Gardner2006-01-101-1/+1
| | | | | | | | | | | A simple driver for the CS5535 and CS5536 that allows a user-space program to manipulate GPIO pins. The CS5535/CS5536 chips are Geode processor companion devices. Signed-off-by: Ben Gardner <bgardner@wabtec.com> Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/pci-2.6Linus Torvalds2006-01-0916-16/+16
|\
| * [PATCH] drivers/sound/oss: Replace pci_module_init() with pci_register_driver()Greg Kroah-Hartman2006-01-0916-16/+16
| | | | | | | | | | | | | | Replace obsolete pci_module_init() with pci_register_driver(). Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Signed-off-by: Richard Knutsson <ricknu-0@student.ltu.se>
* | Merge master.kernel.org:/pub/scm/linux/kernel/git/mingo/mutex-2.6Linus Torvalds2006-01-092-6/+0
|\ \
| * | [PATCH] mutex subsystem, semaphore to mutex: VFS, ->i_semJes Sorensen2006-01-092-6/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | This patch converts the inode semaphore to a mutex. I have tested it on XFS and compiled as much as one can consider on an ia64. Anyway your luck with it might be different. Modified-by: Ingo Molnar <mingo@elte.hu> (finished the conversion) Signed-off-by: Jes Sorensen <jes@sgi.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
* | spelling: s/trough/through/Adrian Bunk2006-01-101-1/+1
|/ | | | | | Additionally, one comment was reformulated by Joe Perches <joe@perches.com>. Signed-off-by: Adrian Bunk <bunk@stusta.de>
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc-mergeLinus Torvalds2006-01-093-70/+114
|\
| * [PATCH] powerpc: Remove device_node addrs/n_addrBenjamin Herrenschmidt2006-01-093-70/+114
| | | | | | | | | | | | | | | | | | | | | | | | The pre-parsed addrs/n_addrs fields in struct device_node are finally gone. Remove the dodgy heuristics that did that parsing at boot and remove the fields themselves since we now have a good replacement with the new OF parsing code. This patch also fixes a bunch of drivers to use the new code instead, so that at least pmac32, pseries, iseries and g5 defconfigs build. Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
* | [PATCH] i810_audio: request_irq() fixAndrew Morton2006-01-081-10/+8
| | | | | | | | | | | | | | | | | | | | | | Request the IRQ after having set everything up. Otherwise a shared interrupt at the right time can kill the machine. Found this with David Woodhouse <dwmw2@infradead.org>'s debug-shared-irqs.patch. Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* | [PATCH] remove gcc-2 checksAndrew Morton2006-01-081-7/+0
|/ | | | | | | | | | | | | Remove various things which were checking for gcc-1.x and gcc-2.x compilers. From: Adrian Bunk <bunk@stusta.de> Some documentation updates and removes some code paths for gcc < 3.2. Acked-by: Russell King <rmk+kernel@arm.linux.org.uk> Signed-off-by: Adrian Bunk <bunk@stusta.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
* Merge with Linus' kernel.Russell King2006-01-07388-25060/+35969
|\
| * Merge ../torvalds-2.6/Greg Kroah-Hartman2006-01-068-521/+1
| |\
| | * [PATCH] oss: remove deprecated PM interface from opl3sa2 driverPatrick Mochel2006-01-061-110/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the old, deprecated interface from the opl3sa2 driver, including the pm_{,un}register() calls, the local storage of the pmdev object and the reference to the old header files. This change is done to assist in eradicating the users of the legacy interface so as to help facilitate the removal of the interface itself. Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * [PATCH] oss: remove deprecated PM interface from nm256 driverPatrick Mochel2006-01-061-47/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the old, deprecated interface from the nm256 driver, including the pm_{,un}register() calls, the local storage of the pmdev object and the reference to the old header files. This change is done to assist in eradicating the users of the legacy interface so as to help facilitate the removal of the interface itself. Note that this driver has been obsoleted by an ALSA equivalent. Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * [PATCH] oss: remove deprecated PM interface from maestro driverPatrick Mochel2006-01-061-149/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the old, deprecated interface from the maestro driver, including the pm_{,un}register() calls, the local storage of the pmdev object and the reference to the old header files. This change is done to assist in eradicating the users of the legacy interface so as to help facilitate the removal of the interface itself. The check_suspend() function and associated logic was not removed, even though it is now unnecessary. Note that this driver has been obsoleted by an ALSA equivalent. Acked-by: Zach Brown <zab@zabbo.net> Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * [PATCH] oss: remove deprecated PM interface from cs46xx driverPatrick Mochel2006-01-062-64/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the old, deprecated interface from the cs46xx driver, including the pm_{,un}register() calls, the local storage of the pmdev object and the reference to the old header files. This change is done to assist in eradicating the users of the legacy interface so as to help facilitate the removal of the interface itself. Note this driver has PCI PM hooks which are set properly. It also has the ability to trigger suspend/resume from an ioctl. This functionality was not touched, though it could use a serious review if this driver continues to persist in the mainline tree.. Note that this driver has been obsoleted by an ALSA equivalent. Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * [PATCH] oss: remove deprecated PM interface from cs4281 driverPatrick Mochel2006-01-062-59/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the old, deprecated interface from the cs4281 driver, including the pm_{,un}register() calls, the local storage of the pmdev object and the reference to the old header files. This change is done to assist in eradicating the users of the legacy interface so as to help facilitate the removal of the interface itself. Note that this driver has been obsoleted by an ALSA equivalent. Note that this driver has hooks for PCI power management, but does not implement the ->suspend()/->resume() methods. Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| | * [PATCH] oss: remove deprecated PM interface from ad1848 driverPatrick Mochel2006-01-061-92/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change removes the old, deprecated interface from the ad1848 driver, including the pm_{,un}register() calls, the local storage of the pmdev object and the reference to the old header files. This change is done to assist in eradicating the users of the legacy interface so as to help facilitate the removal of the interface itself. Signed-off-by: Patrick Mochel <mochel@linux.intel.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
| * | [PATCH] I2C: Remove .owner setting from i2c_driver as it's no longer neededGreg Kroah-Hartman2006-01-053-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that i2c_add_driver() doesn't need the module owner to be set by hand, we can delete it from the drivers. This patch catches all of the drivers that I found in the current tree (if a driver sets the .owner by hand, it's not a problem, just not needed.) Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> Cc: Jean Delvare <khali@linux-fr.org>
| * | [PATCH] i2c: Drop i2c_driver.{owner,name}, 7 of 11Laurent Riffard2006-01-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should use the i2c_driver.driver's .name and .owner fields instead of the i2c_driver's ones. This patch updates the drivers for ppc arch. Signed-off-by: Laurent Riffard <laurent.riffard@free.fr> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | [PATCH] i2c: Drop i2c_driver.{owner,name}, 6 of 11Laurent Riffard2006-01-052-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should use the i2c_driver.driver's .name and .owner fields instead of the i2c_driver's ones. This patch updates the OSS drivers. Signed-off-by: Laurent Riffard <laurent.riffard@free.fr> Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * | [PATCH] i2c: Drop i2c_driver.flags, 2 of 3Jean Delvare2006-01-053-3/+0
| |/ | | | | | | | | | | | | | | | | | | | | Just about every i2c chip driver sets the I2C_DF_NOTIFY flag, so we can simply make it the default and drop the flag. If any driver really doesn't want to be notified when i2c adapters are added, that driver can simply omit to set .attach_adapter. This approach is also more robust as it prevents accidental NULL pointer dereferences. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| * [PATCH] pcmcia: fix sound driversDominik Brodowski2006-01-062-194/+115
| | | | | | | | | | | | | | Update the PCMCIA sound drivers to handle the recent changes to the PCMCIA core. A part of this merge was done by Takashi Iwai <tiwai@suse.de>. Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/perex/alsaLinus Torvalds2006-01-04378-24338/+35847
| |\
| | * [ALSA] ad1889 - remove CVS ID from the driver identificationJaroslav Kysela2006-01-041-1/+1
| | | | | | | | | | | | Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| | * [ALSA] opl3 - Fix the unreleased resourcesTakashi Iwai2006-01-041-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | Modules: OPL3 Fix the unreleased resources in the error path of snd_opl3_create(). Signed-off-by: Takashi Iwai <tiwai@suse.de>
| | * [ALSA] Revert the nested-device patchTakashi Iwai2006-01-042-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Modules: ALSA Core Revert the nested-device patch to keep the compatibility with the current HAL configuration. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| | * [ALSA] dummy driver - added CA0106 emulation definesJaroslav Kysela2006-01-041-1/+17
| | | | | | | | | | | | | | | | | | Modules: Generic drivers Signed-off-by: Jaroslav Kysela <perex@suse.cz>
| | * [ALSA] Remove xxx_t typedefs: SPARC CS4231Takashi Iwai2006-01-031-174/+168
| | | | | | | | | | | | | | | | | | Remove xxx_t typedefs from the SPARC CS4231 driver. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| | * [ALSA] snd-emu10k1: Add new SB Live 5.1 PCI-ID.James Courtier-Dutton2006-01-031-0/+8
| | | | | | | | | | | | | | | | | | Modules: EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
| | * [ALSA] snd-emu10k1: Correct control names for Audigy 4 Pro.James Courtier-Dutton2006-01-031-1/+11
| | | | | | | | | | | | | | | | | | Modules: EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
| | * [ALSA] hda-codec - Add model entry for Shuttle ST20G5Takashi Iwai2006-01-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Modules: HDA Codec driver Added the model entry for Shuttle ST20G5. Signed-off-by: Takashi Iwai <tiwai@suse.de>
| | * [ALSA] emu10k1 - Clean up p16v codeTakashi Iwai2006-01-031-281/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modules: EMU10K1/EMU10K2 driver Clean up and optimize the codes in p16v.c - Add proper __devinit* tags - Reduce unnecessary functions using a closure - Fix whitespaces - Rename 'Unknown' to 'Side' controls Signed-off-by: Takashi Iwai <tiwai@suse.de>
| | * [ALSA] snd-emu10k1: Add comments regarding chips present on the card.James Courtier-Dutton2006-01-031-2/+11
| | | | | | | | | | | | | | | | | | Modules: EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
| | * [ALSA] snd-emu10k1: Add some comments regarding chip types.James Courtier-Dutton2006-01-031-0/+14
| | | | | | | | | | | | | | | | | | Modules: EMU10K1/EMU10K2 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
| | * [ALSA] snd-ca0106: Fix SPI driver code. Fixes speaker output.James Courtier-Dutton2006-01-031-15/+57
| | | | | | | | | | | | | | | | | | Modules: CA0106 driver Signed-off-by: James Courtier-Dutton <James@superbug.co.uk>
OpenPOWER on IntegriCloud