vserver 2.0 rc7

[linux-2.6.git] / include / asm-ppc / pci.h

diff --git a/include/asm-ppc/pci.h b/include/asm-ppc/pci.h
index 5349f5c..ce5ae6d 100644 (file)
--- a/include/asm-ppc/pci.h
+++ b/include/asm-ppc/pci.h
@@ -79,9 +79,8 @@ extern unsigned long pci_bus_to_phys(unsigned int ba, int busnr);
 #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
 
 /* Set the name of the bus as it appears in /proc/bus/pci */
-static inline int pci_name_bus(char *name, struct pci_bus *bus)
+static inline int pci_proc_domain(struct pci_bus *bus)
 {
-       sprintf(name, "%02x", bus->number);
        return 0;
 }
 
@@ -98,6 +97,12 @@ pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region,
 
 extern void pcibios_add_platform_entries(struct pci_dev *dev);
 
+struct file;
+extern pgprot_t        pci_phys_mem_access_prot(struct file *file,
+                                        unsigned long offset,
+                                        unsigned long size,
+                                        pgprot_t prot);
+
 #endif /* __KERNEL__ */
 
 #endif /* __PPC_PCI_H */