diff --git a/[refs] b/[refs]
index fd23eeed62ab..13e746e8a34e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 552e450929a7298cc8834fd2824a60b2e914f70e
+refs/heads/master: ac48eee064f743a198cb38e5a6a62c3f1082ebc1
diff --git a/trunk/drivers/spi/spi_sh_msiof.c b/trunk/drivers/spi/spi_sh_msiof.c
index 51e5e1dfa6e5..3b5b1be57057 100644
--- a/trunk/drivers/spi/spi_sh_msiof.c
+++ b/trunk/drivers/spi/spi_sh_msiof.c
@@ -20,12 +20,12 @@
 #include <linux/bitmap.h>
 #include <linux/clk.h>
 #include <linux/io.h>
+#include <linux/err.h>
 
 #include <linux/spi/spi.h>
 #include <linux/spi/spi_bitbang.h>
 #include <linux/spi/sh_msiof.h>
 
-#include <asm/spi.h>
 #include <asm/unaligned.h>
 
 struct sh_msiof_spi_priv {