diff --git a/[refs] b/[refs]
index a3cb166e21b0..26dc493e2645 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b63eaed0da3370817f74002b81a57b25c43e72cb
+refs/heads/master: 48f658bb3d582c13b5d0b86b0295d5e0050e60c9
diff --git a/trunk/drivers/staging/panel/panel.c b/trunk/drivers/staging/panel/panel.c
index 377884f3480d..f9fcb2fef5a0 100644
--- a/trunk/drivers/staging/panel/panel.c
+++ b/trunk/drivers/staging/panel/panel.c
@@ -57,7 +57,7 @@
 #include <generated/utsrelease.h>
 
 #include <linux/io.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 #include <asm/system.h>
 
 #define LCD_MINOR		156