From: Adrian Bunk <bunk@stusta.de>
Date: Sat, 21 Jul 2007 11:37:52 +0000 (-0700)
Subject: spi.c:scan_boardinfo() mustn't be __init_or_module
X-Git-Tag: v2.6.23-rc1~158
X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=149a6501f90df457d75a1954dd5a29434a182e6a;hp=8b6f50ef1d5cc86b278eb42bc91630fad455fb10;p=safe%2Fjmp%2Flinux-2.6

spi.c:scan_boardinfo() mustn't be __init_or_module

WARNING: drivers/built-in.o(.text+0x889735): Section mismatch: reference to .init.text:scan_boardinfo (between 'spi_register_master' and '__unregister')

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Acked-by: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 018884d..b05de30 100644
--- a/drivers/spi/spi.c
+++ b/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;