diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /sound/synth | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'sound/synth')
| -rw-r--r-- | sound/synth/emux/emux_hwdep.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c index ff0b2a8fd25b..5ae1eae9f6db 100644 --- a/sound/synth/emux/emux_hwdep.c +++ b/sound/synth/emux/emux_hwdep.c | |||
| @@ -128,6 +128,9 @@ snd_emux_init_hwdep(struct snd_emux *emu) | |||
| 128 | strcpy(hw->name, SNDRV_EMUX_HWDEP_NAME); | 128 | strcpy(hw->name, SNDRV_EMUX_HWDEP_NAME); |
| 129 | hw->iface = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE; | 129 | hw->iface = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE; |
| 130 | hw->ops.ioctl = snd_emux_hwdep_ioctl; | 130 | hw->ops.ioctl = snd_emux_hwdep_ioctl; |
| 131 | /* The ioctl parameter types are compatible between 32- and | ||
| 132 | * 64-bit architectures, so use the same function. */ | ||
| 133 | hw->ops.ioctl_compat = snd_emux_hwdep_ioctl; | ||
| 131 | hw->exclusive = 1; | 134 | hw->exclusive = 1; |
| 132 | hw->private_data = emu; | 135 | hw->private_data = emu; |
| 133 | if ((err = snd_card_register(emu->card)) < 0) | 136 | if ((err = snd_card_register(emu->card)) < 0) |