diff --git a/[refs] b/[refs]
index 80595ed507a0..f057a3e6819e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d207ac0f7c9736782bfa51cff2109b74d26c3622
+refs/heads/master: f312094556619aed849862089938c14aa6a5b84b
diff --git a/trunk/include/asm-parisc/pci.h b/trunk/include/asm-parisc/pci.h
index 8b631f47eb25..7b8ad118d2fe 100644
--- a/trunk/include/asm-parisc/pci.h
+++ b/trunk/include/asm-parisc/pci.h
@@ -293,4 +293,9 @@ static inline void pcibios_penalize_isa_irq(int irq, int active)
 	/* We don't need to penalize isa irq's */
 }
 
+static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
+{
+	return channel ? 15 : 14;
+}
+
 #endif /* __ASM_PARISC_PCI_H */