diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-04-18 23:18:53 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-04-18 23:18:53 +0100 |
| commit | 7ea3bbbc8997df1ae7dc4e736d163dabc00f4721 (patch) | |
| tree | 30bbfb741d7e1e0bafb27097d496f75e7bf44d05 | |
| parent | a9a5cd5d2a57fb76dbae2115450f777b69beccf7 (diff) | |
| download | op-kernel-dev-7ea3bbbc8997df1ae7dc4e736d163dabc00f4721.zip op-kernel-dev-7ea3bbbc8997df1ae7dc4e736d163dabc00f4721.tar.gz | |
[ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure
Patch from Richard Purdie
Move platform_scoop_config from the SharpSL scoop PCMCIA driver to
the SCOOP driver. This avoids build failures when PCMCIA is not built
or is modular (scoop.c itself cannot be modular).
Signed-off-by: Richard Purdie <rpurdie@rpsys.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/common/scoop.c | 12 | ||||
| -rw-r--r-- | drivers/pcmcia/pxa2xx_sharpsl.c | 8 |
2 files changed, 12 insertions, 8 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index 5e830f4..314ebd3 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -18,6 +18,18 @@ #include <asm/io.h> #include <asm/hardware/scoop.h> +/* PCMCIA to Scoop linkage + + There is no easy way to link multiple scoop devices into one + single entity for the pxa2xx_pcmcia device so this structure + is used which is setup by the platform code. + + This file is never modular so this symbol is always + accessile to the board support files. +*/ +struct scoop_pcmcia_config *platform_scoop_config; +EXPORT_SYMBOL(platform_scoop_config); + #define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr))) struct scoop_dev { diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index fd36473..b7b9e14 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c @@ -26,14 +26,6 @@ #include "soc_common.h" #define NO_KEEP_VS 0x0001 - -/* PCMCIA to Scoop linkage - - There is no easy way to link multiple scoop devices into one - single entity for the pxa2xx_pcmcia device so this structure - is used which is setup by the platform code -*/ -struct scoop_pcmcia_config *platform_scoop_config; #define SCOOP_DEV platform_scoop_config->devs static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt) |
