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 /include/asm-arm/hardware/scoop.h | |
| parent | 329f7dba5f7dc3bc9a30ad00cf373d2e83115aa1 (diff) | |
| parent | 72274c9e24d58d09489d37e732545e52395da270 (diff) | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'include/asm-arm/hardware/scoop.h')
| -rw-r--r-- | include/asm-arm/hardware/scoop.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/asm-arm/hardware/scoop.h b/include/asm-arm/hardware/scoop.h index a8f1013930e..d37bf744326 100644 --- a/include/asm-arm/hardware/scoop.h +++ b/include/asm-arm/hardware/scoop.h @@ -52,8 +52,14 @@ struct scoop_pcmcia_dev { unsigned char keep_rd; }; -extern int scoop_num; -extern struct scoop_pcmcia_dev *scoop_devs; +struct scoop_pcmcia_config { + struct scoop_pcmcia_dev *devs; + int num_devs; + void (*pcmcia_init)(void); + void (*power_ctrl)(struct device *scoop, unsigned short cpr, int nr); +}; + +extern struct scoop_pcmcia_config *platform_scoop_config; void reset_scoop(struct device *dev); unsigned short set_scoop_gpio(struct device *dev, unsigned short bit); |