diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 05:35:07 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-03-28 05:35:07 +0200 |
| commit | 7b724a2260731edbddadfa08f13de5bce2e601a2 (patch) | |
| tree | dcf905f023635ee22aacd917d2a2706f257ee7eb /sound/oss/dev_table.h | |
| parent | Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/same... (diff) | |
| parent | ALSA: Fix yet another race in disconnection (diff) | |
| download | linux-7b724a2260731edbddadfa08f13de5bce2e601a2.tar.xz linux-7b724a2260731edbddadfa08f13de5bce2e601a2.zip | |
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: Fix yet another race in disconnection
ALSA: asihpi - Update verbose debug print macros
ALSA: asihpi - Improve non-busmaster adapter operation
ALSA: asihpi - Support single-rate no-SRC cards
ALSA: HDA: New AD1984A model for Dell Precision R5500
ALSA: vmalloc buffers should use normal mmap
ALSA: hda - Fix SPDIF out regression on ALC889
ALSA: usb-audio - Support for Boss JS-8 Jam Station
ALSA: usb-audio: add Cakewalk UM-1G support
sound/oss/opl3: validate voice and channel indexes
sound/oss: remove offset from load_patch callbacks
Diffstat (limited to 'sound/oss/dev_table.h')
| -rw-r--r-- | sound/oss/dev_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/oss/dev_table.h b/sound/oss/dev_table.h index b7617bee6388..0199a317c5a9 100644 --- a/sound/oss/dev_table.h +++ b/sound/oss/dev_table.h @@ -271,7 +271,7 @@ struct synth_operations void (*reset) (int dev); void (*hw_control) (int dev, unsigned char *event); int (*load_patch) (int dev, int format, const char __user *addr, - int offs, int count, int pmgr_flag); + int count, int pmgr_flag); void (*aftertouch) (int dev, int voice, int pressure); void (*controller) (int dev, int voice, int ctrl_num, int value); void (*panning) (int dev, int voice, int value); |