diff --git a/[refs] b/[refs]
index 6ffe1057d0e1..a8bb01c95826 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2db873211ba47ef704c301f9ecf4a33413a0b649
+refs/heads/master: 4d8f54d9e4323baae8c8ca753db91563f4b34ddb
diff --git a/trunk/drivers/char/nvram.c b/trunk/drivers/char/nvram.c
index a22662b6a1a5..39f6357e3b5d 100644
--- a/trunk/drivers/char/nvram.c
+++ b/trunk/drivers/char/nvram.c
@@ -107,7 +107,6 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/spinlock.h>
-#include <linux/smp_lock.h>
 
 #include <asm/io.h>
 #include <asm/uaccess.h>