projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'mymerge' of ssh://ozlabs.org/home/sfr/kernel-sfr
[powerpc.git]
/
include
/
asm-arm
/
hardware
/
scoop.h
diff --git
a/include/asm-arm/hardware/scoop.h
b/include/asm-arm/hardware/scoop.h
index
a8f1013
..
d37bf74
100644
(file)
--- 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;
};
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);
void reset_scoop(struct device *dev);
unsigned short set_scoop_gpio(struct device *dev, unsigned short bit);