Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 4 insertions, 1 deletions

diff --git a/sound/sound_core.c b/sound/sound_core.c
index cb61317df509..6ce277860fd7 100644
--- a/sound/sound_core.c
+++ b/sound/sound_core.c
@@ -104,7 +104,6 @@ module_exit(cleanup_soundcore);
 
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <linux/smp_lock.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/sound.h>
@@ -165,6 +164,7 @@ static const struct file_operations soundcore_fops =
         /* We must have an owner or the module locking fails */
         .owner  = THIS_MODULE,
         .open   = soundcore_open,
+        .llseek = noop_llseek,
 };
 
 /*
@@ -384,6 +384,9 @@ int register_sound_special_device(const struct file_operations *fops, int unit,
             case 4:
                 name = "audio";
                 break;
+            case 5:
+                name = "dspW";
+                break;
             case 8:
                 name = "sequencer2";
                 if (unit >= SOUND_STEP)