aboutsummaryrefslogtreecommitdiff
path: root/drivers/spi
diff options
context:
space:
mode:
authorAdrian Bunk <bunk@stusta.de>2007-07-21 04:37:52 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-07-21 17:49:16 -0700
commit149a6501f90df457d75a1954dd5a29434a182e6a (patch)
tree1ca514a7d42c2db0e500722d6ffc950743935be5 /drivers/spi
parent8b6f50ef1d5cc86b278eb42bc91630fad455fb10 (diff)
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>
Diffstat (limited to 'drivers/spi')
-rw-r--r--drivers/spi/spi.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
index 018884d7a5f..b05de30b5d9 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;