diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 07:34:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-08 07:34:26 -0800 |
| commit | 56b78921c32ae825c596c158e74ab48c0e8e280d (patch) | |
| tree | 3a5b9dd3b89c1f4d1bf7fe75e3283bd490bee40e /sound/oss | |
| parent | 3c443cbc1dbb9a3b4dd9a134b97349195bcb4990 (diff) | |
| parent | a3087ae970e5c8984fab2306b1f4dbe5ef132ff7 (diff) | |
| download | kernel_samsung_smdk4412-56b78921c32ae825c596c158e74ab48c0e8e280d.zip kernel_samsung_smdk4412-56b78921c32ae825c596c158e74ab48c0e8e280d.tar.gz kernel_samsung_smdk4412-56b78921c32ae825c596c158e74ab48c0e8e280d.tar.bz2 | |
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: (26 commits)
ALSA: hdmi - show debug message on changing audio infoframe
ALSA: hdmi - merge common code for intelhdmi and nvhdmi
ALSA: hda - Add ASRock mobo to MSI blacklist
ALSA: hda: uninitialized variable fix
ALSA: hda: Use LPIB for a Biostar Microtech board
ALSA: usb/audio.h: Fix field order
ALSA: fix jazz16 compile (udelay)
ALSA: hda: Use LPIB for Dell Latitude 131L
ALSA: hda - Build hda_eld into snd-hda-codec module
ALSA: hda - Support NVIDIA MCP89 and GT21x hdmi audio
ALSA: hda - Support max codecs to 8 for nvidia hda controller
ALSA: riptide: clean up while loop
ALSA: usbaudio - remove debug "SAMPLE BYTES" printk line
ALSA: timer - pass real event in snd_timer_notify1() to instance callback
ALSA: oxygen: change || to &&
ALSA: opti92x: use PnP data to select Master Control port
ASoC: fix ak4104 register array access
ASoC: soc_pcm_open: Add missing bailout tag
ALSA: usbaudio: Fix wrong bitrate for Creative Creative VF0470 Live Cam
ALSA: ua101: removing debugging code
...
Diffstat (limited to 'sound/oss')
| -rw-r--r-- | sound/oss/coproc.h | 2 | ||||
| -rw-r--r-- | sound/oss/v_midi.h | 5 |
2 files changed, 3 insertions, 4 deletions
diff --git a/sound/oss/coproc.h b/sound/oss/coproc.h index 7306346..7bec21b 100644 --- a/sound/oss/coproc.h +++ b/sound/oss/coproc.h @@ -4,7 +4,7 @@ */ /* - * Coprocessor access types + * Coprocessor access types */ #define COPR_CUSTOM 0x0001 /* Custom applications */ #define COPR_MIDI 0x0002 /* MIDI (MPU-401) emulation */ diff --git a/sound/oss/v_midi.h b/sound/oss/v_midi.h index 1b86cb4..08e2185 100644 --- a/sound/oss/v_midi.h +++ b/sound/oss/v_midi.h @@ -2,9 +2,9 @@ typedef struct vmidi_devc { int dev; /* State variables */ - int opened; + int opened; spinlock_t lock; - + /* MIDI fields */ int my_mididev; int pair_mididev; @@ -12,4 +12,3 @@ typedef struct vmidi_devc { int intr_active; void (*midi_input_intr) (int dev, unsigned char data); } vmidi_devc; - |