diff --git a/[refs] b/[refs]
index 2471657f9c12..e58518c7eff8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b6f50ef1d5cc86b278eb42bc91630fad455fb10
+refs/heads/master: 149a6501f90df457d75a1954dd5a29434a182e6a
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index 018884d7a5fa..b05de30b5d9b 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -303,8 +303,7 @@ spi_register_board_info(struct spi_board_info const *info, unsigned n)
  * creates board info from kernel command lines
  */
 
-static void __init_or_module
-scan_boardinfo(struct spi_master *master)
+static void scan_boardinfo(struct spi_master *master)
 {
 	struct boardinfo	*bi;
 	struct device		*dev = master->cdev.dev;