diff options
| author | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:45:34 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:45:34 -0700 |
| commit | 1e231efe50ffe4d291be24d2fe393188de9c4b08 (patch) | |
| tree | 5a7b92970eedd27c74bdf29c2cbe23e9b6a6a849 /arch/arm/common/scoop.c | |
| parent | ef88b7dba2b47c70037a34a599d383462bb74bd3 (diff) | |
| parent | 0ce7625f3c1e3f921f6b83f7e944e00031a39dfa (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/common/scoop.c')
| -rw-r--r-- | arch/arm/common/scoop.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index cfd0d3e550d..688a595598c 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -17,6 +17,12 @@ #define SCOOP_REG(d,adr) (*(volatile unsigned short*)(d +(adr))) +/* PCMCIA to Scoop linkage structures for pxa2xx_sharpsl.c + There is no easy way to link multiple scoop devices into one + single entity for the pxa2xx_pcmcia device */ +int scoop_num; +struct scoop_pcmcia_dev *scoop_devs; + struct scoop_dev { void *base; spinlock_t scoop_lock; |