vserver 2.0 rc7

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

diff --git a/include/asm-alpha/pci.h b/include/asm-alpha/pci.h
index bbefe12..0c7b57b 100644 (file)
--- a/include/asm-alpha/pci.h
+++ b/include/asm-alpha/pci.h
@@ -223,22 +223,21 @@ pci_dac_dma_sync_single_for_device(struct pci_dev *pdev, dma64_addr_t dma_addr,
        /* Nothing to do. */
 }
 
+/* TODO: integrate with include/asm-generic/pci.h ? */
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+       return channel ? 15 : 14;
+}
+
 extern void pcibios_resource_to_bus(struct pci_dev *, struct pci_bus_region *,
                                    struct resource *);
 
 #define pci_domain_nr(bus) ((struct pci_controller *)(bus)->sysdata)->index
 
-static inline int
-pci_name_bus(char *name, struct pci_bus *bus)
+static inline int pci_proc_domain(struct pci_bus *bus)
 {
        struct pci_controller *hose = bus->sysdata;
-
-       if (likely(hose->need_domain_info == 0)) {
-               sprintf(name, "%02x", bus->number);
-       } else {
-               sprintf(name, "%04x:%02x", hose->index, bus->number);
-       }
-       return 0;
+       return hose->need_domain_info;
 }
 
 static inline void