From 44cf451d6921d880198ef75cb929186f43bb7447 Mon Sep 17 00:00:00 2001
From: Mark Brown <broonie@opensource.wolfsonmicro.com>
Date: Fri, 17 Feb 2012 16:23:29 -0800
Subject: [PATCH] --- yaml --- r: 291947 b: refs/heads/master c:
 690fb11be34cc908ef895d16c6c1673df1b4667a h: refs/heads/master i:   291945:
 58c8354ce9dd47eeb797aeb6768b0dd817813b07   291943:
 c1d3f58bfac7fe08ee1898bb2f7ac0a99fc9a6f4 v: v3

---
 [refs]                  | 2 +-
 trunk/drivers/spi/spi.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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;