Merge branch 'master' into csb1725

[mv-sheeva.git] / sound / synth / emux / emux_hwdep.c

diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c
index ff0b2a8fd25bbe20dd51191935582746f8ba6edf..5ae1eae9f6dbc2491c5b6bb378ca81cc896e22dc 100644 (file)
--- 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)
        strcpy(hw->name, SNDRV_EMUX_HWDEP_NAME);
        hw->iface = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE;
        hw->ops.ioctl = snd_emux_hwdep_ioctl;
+       /* The ioctl parameter types are compatible between 32- and
+        * 64-bit architectures, so use the same function. */
+       hw->ops.ioctl_compat = snd_emux_hwdep_ioctl;
        hw->exclusive = 1;
        hw->private_data = emu;
        if ((err = snd_card_register(emu->card)) < 0)