[PATCH] drivers/spi/: fix section mismatches

WARNING: drivers/built-in.o - Section mismatch: reference to .init.text:spi_register_master from .text between 'spi_bitbang_start' (at offset 0x84e11a) and 'bitbang_work'
  WARNING: drivers/built-in.o - Section mismatch: reference to .init.text:spi_alloc_master from .text between 'butterfly_attach' (at offset 0x84e681) and 'at25_remove'
  WARNING: drivers/built-in.o - Section mismatch: reference to .init.text:spi_new_device from .text between 'butterfly_attach' (at offset 0x84e7e4) and 'at25_remove'

Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-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>
This commit is contained in:
Adrian Bunk 2007-03-26 21:32:23 -08:00 committed by Linus Torvalds
parent 78d832f626
commit e9d5a46115
1 changed files with 4 additions and 6 deletions

View File

@ -189,8 +189,8 @@ static DECLARE_MUTEX(board_lock);
* this is exported so that for example a USB or parport based adapter * this is exported so that for example a USB or parport based adapter
* driver could add devices (which it would learn about out-of-band). * driver could add devices (which it would learn about out-of-band).
*/ */
struct spi_device *__init_or_module struct spi_device *spi_new_device(struct spi_master *master,
spi_new_device(struct spi_master *master, struct spi_board_info *chip) struct spi_board_info *chip)
{ {
struct spi_device *proxy; struct spi_device *proxy;
struct device *dev = master->cdev.dev; struct device *dev = master->cdev.dev;
@ -352,8 +352,7 @@ static struct class spi_master_class = {
* the master's methods before calling spi_register_master(); and (after errors * the master's methods before calling spi_register_master(); and (after errors
* adding the device) calling spi_master_put() to prevent a memory leak. * adding the device) calling spi_master_put() to prevent a memory leak.
*/ */
struct spi_master * __init_or_module struct spi_master *spi_alloc_master(struct device *dev, unsigned size)
spi_alloc_master(struct device *dev, unsigned size)
{ {
struct spi_master *master; struct spi_master *master;
@ -392,8 +391,7 @@ EXPORT_SYMBOL_GPL(spi_alloc_master);
* After a successful return, the caller is responsible for calling * After a successful return, the caller is responsible for calling
* spi_unregister_master(). * spi_unregister_master().
*/ */
int __init_or_module int spi_register_master(struct spi_master *master)
spi_register_master(struct spi_master *master)
{ {
static atomic_t dyn_bus_id = ATOMIC_INIT((1<<16) - 1); static atomic_t dyn_bus_id = ATOMIC_INIT((1<<16) - 1);
struct device *dev = master->cdev.dev; struct device *dev = master->cdev.dev;