diff options
-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 5e830f444c6c..314ebd3a1d71 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c | |||
@@ -18,6 +18,18 @@ | |||
18 | #include <asm/io.h> | 18 | #include <asm/io.h> |
19 | #include <asm/hardware/scoop.h> | 19 | #include <asm/hardware/scoop.h> |
20 | 20 | ||
21 | /* PCMCIA to Scoop linkage | ||
22 | |||
23 | There is no easy way to link multiple scoop devices into one | ||
24 | single entity for the pxa2xx_pcmcia device so this structure | ||
25 | is used which is setup by the platform code. | ||
26 | |||
27 | This file is never modular so this symbol is always | ||
28 | accessile to the board support files. | ||
29 | */ | ||
30 | struct scoop_pcmcia_config *platform_scoop_config; | ||
31 | EXPORT_SYMBOL(platform_scoop_config); | ||
32 | |||
21 | #define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr))) | 33 | #define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr))) |
22 | 34 | ||
23 | struct scoop_dev { | 35 | struct scoop_dev { |
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c index fd3647368955..b7b9e149c5b9 100644 --- a/drivers/pcmcia/pxa2xx_sharpsl.c +++ b/drivers/pcmcia/pxa2xx_sharpsl.c | |||
@@ -26,14 +26,6 @@ | |||
26 | #include "soc_common.h" | 26 | #include "soc_common.h" |
27 | 27 | ||
28 | #define NO_KEEP_VS 0x0001 | 28 | #define NO_KEEP_VS 0x0001 |
29 | |||
30 | /* PCMCIA to Scoop linkage | ||
31 | |||
32 | There is no easy way to link multiple scoop devices into one | ||
33 | single entity for the pxa2xx_pcmcia device so this structure | ||
34 | is used which is setup by the platform code | ||
35 | */ | ||
36 | struct scoop_pcmcia_config *platform_scoop_config; | ||
37 | #define SCOOP_DEV platform_scoop_config->devs | 29 | #define SCOOP_DEV platform_scoop_config->devs |
38 | 30 | ||
39 | static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt) | 31 | static void sharpsl_pcmcia_init_reset(struct soc_pcmcia_socket *skt) |