[kernel] r8057 - in dists/sid/linux-2.6/debian: . patches/bugfix/mips patches/series

[Martin Michlmayr]

Author: tbm
Date: Fri Dec 29 22:26:51 2006
New Revision: 8057

Added:
   dists/sid/linux-2.6/debian/patches/bugfix/mips/provide-pci_get_legacy_ide_irq.patch
Modified:
   dists/sid/linux-2.6/debian/changelog
   dists/sid/linux-2.6/debian/patches/series/9
Log:
mips: provide pci_get_legacy_ide_irq needed by some IDE drivers


Modified: dists/sid/linux-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-2.6/debian/changelog	(original)
+++ dists/sid/linux-2.6/debian/changelog	Fri Dec 29 22:26:51 2006
@@ -9,6 +9,8 @@
     (closes: #401006, #401980, #402707) ...
   * ... and add an alternative msync patch from Hugh Dickins that
     doesn't depend on the mm changes (closes: #394392).
+  * mips: provide pci_get_legacy_ide_irq needed by some IDE drivers
+    (see #404950).
 
   [ Bastian Blank ]
   * Bump ABI to 4.

Added: dists/sid/linux-2.6/debian/patches/bugfix/mips/provide-pci_get_legacy_ide_irq.patch
==============================================================================
--- (empty file)
+++ dists/sid/linux-2.6/debian/patches/bugfix/mips/provide-pci_get_legacy_ide_irq.patch	Fri Dec 29 22:26:51 2006
@@ -0,0 +1,26 @@
+From: Ralf Baechle <ralf at linux-mips.org>
+Date: Sat, 9 Dec 2006 16:12:18 +0000 (+0000)
+Subject: [MIPS] Fix build of several IDE drivers by providing pci_get_legacy_ide_irq
+X-Git-Tag: linux-2.6.20-rc1^0~18
+X-Git-Url: http://www.linux-mips.org/git?p=linux.git;a=commitdiff_plain;h=49a3ea926ff0cc6c5af15d79bfbab075991f5dab;hp=87816c5358a6dde9de43ae58bd06737095ec1a56
+
+[MIPS] Fix build of several IDE drivers by providing pci_get_legacy_ide_irq
+
+Signed-off-by: Ralf Baechle <ralf at linux-mips.org>
+---
+
+diff --git a/include/asm-mips/pci.h b/include/asm-mips/pci.h
+index c4d68be..7f0f120 100644
+--- a/include/asm-mips/pci.h
++++ b/include/asm-mips/pci.h
+@@ -187,4 +187,10 @@ static inline void pcibios_add_platform_entries(struct pci_dev *dev)
+ /* Do platform specific device initialization at pci_enable_device() time */
+ extern int pcibios_plat_dev_init(struct pci_dev *dev);
+ 
++/* Chances are this interrupt is wired PC-style ...  */
++static inline int pci_get_legacy_ide_irq(struct pci_dev *dev, int channel)
++{
++	return channel ? 15 : 14;
++}
++
+ #endif /* _ASM_PCI_H */

Modified: dists/sid/linux-2.6/debian/patches/series/9
==============================================================================
--- dists/sid/linux-2.6/debian/patches/series/9	(original)
+++ dists/sid/linux-2.6/debian/patches/series/9	Fri Dec 29 22:26:51 2006
@@ -39,3 +39,4 @@
 + bugfix/net-r8169-phy-program.patch
 + bugfix/net-r8169-more-alignement-8168.patch
 + bugfix/net-r8169-rm-extraneous-write.patch
++ bugfix/mips/provide-pci_get_legacy_ide_irq.patch