diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 15:15:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-08 15:15:31 -0800 |
| commit | 9f04012c58a32756bbbd0239c4144e835048aa4d (patch) | |
| tree | e5423a1941338b9dd17a82b370cc6c252e0ae1f1 /arch/arm/common/scoop.c | |
| parent | 329f7dba5f7dc3bc9a30ad00cf373d2e83115aa1 (diff) | |
| parent | 72274c9e24d58d09489d37e732545e52395da270 (diff) | |
| download | linux-9f04012c58a32756bbbd0239c4144e835048aa4d.tar.gz linux-9f04012c58a32756bbbd0239c4144e835048aa4d.tar.bz2 linux-9f04012c58a32756bbbd0239c4144e835048aa4d.zip | |
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, 0 insertions, 6 deletions
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c index bb4eff614413..c7fdf390cef9 100644 --- a/arch/arm/common/scoop.c +++ b/arch/arm/common/scoop.c @@ -19,12 +19,6 @@ #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; |