aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2006-04-18 18:01:19 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-04-18 18:01:19 -0700
commitc63f774ca10efa7cbcbd555c072353e1a7ab7fbe (patch)
tree69e843c2f25e384929579be2c3768618ea5b90c4 /drivers
parent385910f2b275a636238f70844f1b6da9fda6f2da (diff)
parent608c783aaa0abe39e3672f65b786cdade8db6df9 (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.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index fd364736895..b7b9e149c5b 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)