[NET]: Define infrastructure to keep 'inuse' changes in an efficent SMP/NUMA way.

[linux-2.6] / include / asm-parisc / pci.h

diff --git a/include/asm-parisc/pci.h b/include/asm-parisc/pci.h
index 8b631f47eb257b90a8a472bd8ed1cbf290d07631..4ba868f44a5e9277994c4ac711565b9064c1f259 100644 (file)
--- a/include/asm-parisc/pci.h
+++ b/include/asm-parisc/pci.h
@@ -149,7 +149,7 @@ extern int parisc_bus_is_phys;      /* in arch/parisc/kernel/setup.c */
 /*
 ** Most PCI devices (eg Tulip, NCR720) also export the same registers
 ** to both MMIO and I/O port space.  Due to poor performance of I/O Port
-** access under HP PCI bus adapters, strongly reccomend use of MMIO
+** access under HP PCI bus adapters, strongly recommend the use of MMIO
 ** address space.
 **
 ** While I'm at it more PA programming notes:
@@ -207,7 +207,7 @@ extern struct pci_bios_ops *pci_bios;
 extern void pcibios_register_hba(struct pci_hba_data *);
 extern void pcibios_set_master(struct pci_dev *);
 #else
-extern inline void pcibios_register_hba(struct pci_hba_data *x)
+static inline void pcibios_register_hba(struct pci_hba_data *x)
 {
 }
 #endif
@@ -238,9 +238,6 @@ extern inline void pcibios_register_hba(struct pci_hba_data *x)
 #define PCIBIOS_MIN_IO          0x10
 #define PCIBIOS_MIN_MEM         0x1000 /* NBPG - but pci/setup-res.c dies */
 
-/* Don't support DAC yet. */
-#define pci_dac_dma_supported(pci_dev, mask)   (0)
-
 /* export the pci_ DMA API in terms of the dma_ one */
 #include <asm-generic/pci-dma-compat.h>
 
@@ -284,13 +281,14 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res)
        return root;
 }
 
-static inline void pcibios_add_platform_entries(struct pci_dev *dev)
+static inline void pcibios_penalize_isa_irq(int irq, int active)
 {
+       /* We don't need to penalize isa irq's */
 }
 
-static inline void pcibios_penalize_isa_irq(int irq, int active)
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
 {
-       /* We don't need to penalize isa irq's */
+       return channel ? 15 : 14;
 }
 
 #endif /* __ASM_PARISC_PCI_H */