V4L/DVB (5818): CinergyT2: fix flush_workqueue() vs work->func() deadlock

[linux-2.6-omap-h63xx.git] / include / asm-ia64 / pci.h

diff --git a/include/asm-ia64/pci.h b/include/asm-ia64/pci.h
index 825eb7d882e63bd7f582ce67c13b9e4e6c1cf977..5a5d1c2ce39d1510e1d2a56dc1322929bab25029 100644 (file)
--- a/include/asm-ia64/pci.h
+++ b/include/asm-ia64/pci.h
@@ -9,6 +9,7 @@
 
 #include <asm/io.h>
 #include <asm/scatterlist.h>
+#include <asm/hw_irq.h>
 
 /*
  * Can be used to override the logic in pci_scan_bus for skipping already-configured bus
@@ -78,9 +79,6 @@ pcibios_penalize_isa_irq (int irq, int active)
 #define pci_dac_dma_sync_single_for_cpu(dev,dma_addr,len,dir)  do { } while (0)
 #define pci_dac_dma_sync_single_for_device(dev,dma_addr,len,dir)       do { mb(); } while (0)
 
-#define sg_dma_len(sg)         ((sg)->dma_length)
-#define sg_dma_address(sg)     ((sg)->dma_address)
-
 #ifdef CONFIG_PCI
 static inline void pci_dma_burst_advice(struct pci_dev *pdev,
                                        enum pci_dma_burst_strategy *strat,
@@ -170,4 +168,10 @@ pcibios_select_root(struct pci_dev *pdev, struct resource *res)
 
 #define pcibios_scan_all_fns(a, b)     0
 
+#define HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+       return channel ? isa_irq_to_vector(15) : isa_irq_to_vector(14);
+}
+
 #endif /* _ASM_IA64_PCI_H */