diff --git a/[refs] b/[refs]
index 83df3561d189..579f6370b00c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ad2a99af0d7242726723575efaffa1625664b384
+refs/heads/master: 690fb11be34cc908ef895d16c6c1673df1b4667a
diff --git a/trunk/drivers/spi/spi.c b/trunk/drivers/spi/spi.c
index c12a9dba2d82..7ea06af8636a 100644
--- a/trunk/drivers/spi/spi.c
+++ b/trunk/drivers/spi/spi.c
@@ -484,7 +484,7 @@ static void spi_match_master_to_boardinfo(struct spi_master *master,
  * The board info passed can safely be __initdata ... but be careful of
  * any embedded pointers (platform_data, etc), they're copied as-is.
  */
-int __init
+int __devinit
 spi_register_board_info(struct spi_board_info const *info, unsigned n)
 {
 	struct boardinfo *bi;