diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 21:01:19 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-18 21:01:19 -0400 |
| commit | c63f774ca10efa7cbcbd555c072353e1a7ab7fbe (patch) | |
| tree | 69e843c2f25e384929579be2c3768618ea5b90c4 /drivers | |
| parent | 385910f2b275a636238f70844f1b6da9fda6f2da (diff) | |
| parent | 608c783aaa0abe39e3672f65b786cdade8db6df9 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] 3479/1: Corgi SSP: Fix potential concurrent access problem
[ARM] 3478/1: SharpSL SCOOP: Fix potenial build failure
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/pcmcia/pxa2xx_sharpsl.c | 8 |
1 files changed, 0 insertions, 8 deletions
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) |