Merge branch 'origin' into devel

Conflicts:
	sound/soc/pxa/pxa2xx-i2s.c

1 files changed, 0 insertions, 21 deletions

diff --git a/sound/synth/emux/emux_hwdep.c b/sound/synth/emux/emux_hwdep.c
index 0a5391436add..ff0b2a8fd25b 100644
--- a/sound/synth/emux/emux_hwdep.c
+++ b/sound/synth/emux/emux_hwdep.c
@@ -24,25 +24,6 @@
 #include <asm/uaccess.h>
 #include "emux_voice.h"
 
-/*
- * open the hwdep device
- */
-static int
-snd_emux_hwdep_open(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
-
-/*
- * close the device
- */
-static int
-snd_emux_hwdep_release(struct snd_hwdep *hw, struct file *file)
-{
-        return 0;
-}
-
 
 #define TMP_CLIENT_ID   0x1001
 
@@ -146,8 +127,6 @@ snd_emux_init_hwdep(struct snd_emux *emu)
         emu->hwdep = hw;
         strcpy(hw->name, SNDRV_EMUX_HWDEP_NAME);
         hw->iface = SNDRV_HWDEP_IFACE_EMUX_WAVETABLE;
-        hw->ops.open = snd_emux_hwdep_open;
-        hw->ops.release = snd_emux_hwdep_release;
         hw->ops.ioctl = snd_emux_hwdep_ioctl;
         hw->exclusive = 1;
         hw->private_data = emu;