summaryrefslogtreecommitdiffstats
path: root/include/asm-ppc64/pci-bridge.h
diff options
context:
space:
mode:
authorPaul Mackerras2005-10-20 13:10:09 +0200
committerPaul Mackerras2005-10-20 13:10:09 +0200
commit17a6392d30b4ed89b88a47a318b2b6de6ae7b946 (patch)
tree1c2a7dbbbce95db33bbfd2725fa19f2d2ecf6ecd /include/asm-ppc64/pci-bridge.h
parentppc64: Use the merged mpic.c (diff)
downloadkernel-qcow2-linux-17a6392d30b4ed89b88a47a318b2b6de6ae7b946.tar.gz
kernel-qcow2-linux-17a6392d30b4ed89b88a47a318b2b6de6ae7b946.tar.xz
kernel-qcow2-linux-17a6392d30b4ed89b88a47a318b2b6de6ae7b946.zip
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.h2
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 {
struct pci_ops *ops;
volatile unsigned int __iomem *cfg_addr;
- volatile unsigned char __iomem *cfg_data;
+ volatile void __iomem *cfg_data;
/* Currently, we limit ourselves to 1 IO range and 3 mem
* ranges since the common pci_bus structure can't handle more