| From fdc858a466b738d35d3492bc7cf77b1dac98bf7c Mon Sep 17 00:00:00 2001 |
| From: Arnd Bergmann <arnd@arndb.de> |
| Date: Mon, 30 Apr 2012 13:50:56 +0000 |
| Subject: pcmcia: sharpsl: don't discard sharpsl_pcmcia_ops |
| |
| From: Arnd Bergmann <arnd@arndb.de> |
| |
| commit fdc858a466b738d35d3492bc7cf77b1dac98bf7c upstream. |
| |
| The sharpsl_pcmcia_ops structure gets passed into |
| sa11xx_drv_pcmcia_probe, where it gets accessed at run-time, |
| unlike all other pcmcia drivers that pass their structures |
| into platform_device_add_data, which makes a copy. |
| |
| This means the gcc warning is valid and the structure |
| must not be marked as __initdata. |
| |
| Without this patch, building collie_defconfig results in: |
| |
| drivers/pcmcia/pxa2xx_sharpsl.c:22:31: fatal error: mach-pxa/hardware.h: No such file or directory |
| compilation terminated. |
| make[3]: *** [drivers/pcmcia/pxa2xx_sharpsl.o] Error 1 |
| make[2]: *** [drivers/pcmcia] Error 2 |
| make[1]: *** [drivers] Error 2 |
| make: *** [sub-make] Error 2 |
| |
| Signed-off-by: Arnd Bergmann <arnd@arndb.de> |
| Cc: Dominik Brodowski <linux@dominikbrodowski.net> |
| Cc: Russell King <rmk+kernel@arm.linux.org.uk> |
| Cc: Pavel Machek <pavel@suse.cz> |
| Cc: linux-pcmcia@lists.infradead.org |
| Cc: Jochen Friedrich <jochen@scram.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| drivers/pcmcia/pxa2xx_sharpsl.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/drivers/pcmcia/pxa2xx_sharpsl.c |
| +++ b/drivers/pcmcia/pxa2xx_sharpsl.c |
| @@ -194,7 +194,7 @@ static void sharpsl_pcmcia_socket_suspen |
| sharpsl_pcmcia_init_reset(skt); |
| } |
| |
| -static struct pcmcia_low_level sharpsl_pcmcia_ops __initdata = { |
| +static struct pcmcia_low_level sharpsl_pcmcia_ops = { |
| .owner = THIS_MODULE, |
| .hw_init = sharpsl_pcmcia_hw_init, |
| .socket_state = sharpsl_pcmcia_socket_state, |
