diff options
| author | Uwe Kleine-König <u.kleine-koenig@pengutronix.de> | 2010-11-04 10:46:14 +0100 |
|---|---|---|
| committer | Dominik Brodowski <linux@dominikbrodowski.net> | 2010-11-10 14:30:01 +0100 |
| commit | 5b85e04e93f9a2963e88156cae8629ee72efd890 (patch) | |
| tree | f905998d2090812375a1a93b660bcf272903f8d4 /drivers/pcmcia/sa1100_h3600.c | |
| parent | 20fffee818ec43b64f58ab25c42705b7dcae16e5 (diff) | |
| download | linux-5b85e04e93f9a2963e88156cae8629ee72efd890.tar.gz linux-5b85e04e93f9a2963e88156cae8629ee72efd890.tar.bz2 linux-5b85e04e93f9a2963e88156cae8629ee72efd890.zip | |
pcmcia/sa1100: don't put machine specific init functions in .init.text
These are called by sa11x0_drv_pcmcia_probe (which is marked now with
__devinit) so they can go to .devinit.text now, too.
This fixes:
WARNING: drivers/pcmcia/sa1100_cs.o(.text+0x10): Section mismatch in reference from the function sa11x0_drv_pcmcia_probe() to the function .init.text:pcmcia_simpad_init()
The function sa11x0_drv_pcmcia_probe() references
the function __init pcmcia_simpad_init().
This is often because sa11x0_drv_pcmcia_probe lacks a __init
annotation or the annotation of pcmcia_simpad_init is wrong.
and a similar warning for pcmcia_collie_init, pcmcia_cerf_init,
pcmcia_h3600_init and pcmcia_shannon_init.
While at it mark pcmcia_assabet_init with __devinit, too.
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
CC: Russell King <linux@arm.linux.org.uk>
CC: Eric Miao <eric.y.miao@gmail.com>
CC: linux-arm-kernel@lists.infradead.org
Signed-off-by: Dominik Brodowski <linux@dominikbrodowski.net>
Diffstat (limited to 'drivers/pcmcia/sa1100_h3600.c')
| -rw-r--r-- | drivers/pcmcia/sa1100_h3600.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pcmcia/sa1100_h3600.c b/drivers/pcmcia/sa1100_h3600.c index 56329ad575a9..edf8f0028898 100644 --- a/drivers/pcmcia/sa1100_h3600.c +++ b/drivers/pcmcia/sa1100_h3600.c @@ -219,7 +219,7 @@ struct pcmcia_low_level h3600_pcmcia_ops = { .socket_suspend = h3600_pcmcia_socket_suspend, }; -int __init pcmcia_h3600_init(struct device *dev) +int __devinit pcmcia_h3600_init(struct device *dev) { int ret = -ENODEV; |