diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-20 07:10:09 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-20 07:10:09 -0400 |
| commit | 17a6392d30b4ed89b88a47a318b2b6de6ae7b946 (patch) | |
| tree | 1c2a7dbbbce95db33bbfd2725fa19f2d2ecf6ecd /include/asm-ppc64/pci-bridge.h | |
| parent | d85b525e6e1d0886eebd1d4c4f954d9d2f226a63 (diff) | |
powerpc/ppc/ppc64: Various compile fixes.
This declares powersave_nap in system.h and makes it an int everywhere,
fixes typos for the maple platform, fixes a couple of places where
I missed removing the last two arguments from a message_pass function,
and makes ppc64 consistent with ppc32 in the type of the
pci_bridge.cfg_data field.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'include/asm-ppc64/pci-bridge.h')
| -rw-r--r-- | include/asm-ppc64/pci-bridge.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-ppc64/pci-bridge.h b/include/asm-ppc64/pci-bridge.h index 1136cb6433bf..7d8ecb507a3d 100644 --- a/include/asm-ppc64/pci-bridge.h +++ b/include/asm-ppc64/pci-bridge.h | |||
| @@ -36,7 +36,7 @@ struct pci_controller { | |||
| 36 | 36 | ||
| 37 | struct pci_ops *ops; | 37 | struct pci_ops *ops; |
| 38 | volatile unsigned int __iomem *cfg_addr; | 38 | volatile unsigned int __iomem *cfg_addr; |
| 39 | volatile unsigned char __iomem *cfg_data; | 39 | volatile void __iomem *cfg_data; |
| 40 | 40 | ||
| 41 | /* Currently, we limit ourselves to 1 IO range and 3 mem | 41 | /* Currently, we limit ourselves to 1 IO range and 3 mem |
| 42 | * ranges since the common pci_bus structure can't handle more | 42 | * ranges since the common pci_bus structure can't handle more |