[kernel] r5604 - dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches

[Martin Michlmayr]

Author: tbm
Date: Thu Jan 26 18:22:30 2006
New Revision: 5604

Modified:
   dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/28_cobalt_ide.dpatch
Log:
fixed patch


Modified: dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/28_cobalt_ide.dpatch
==============================================================================
--- dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/28_cobalt_ide.dpatch	(original)
+++ dists/trunk/arch/mips/linux-patch-2.6.15-mips-2.6.15/debian/patches/28_cobalt_ide.dpatch	Thu Jan 26 18:22:30 2006
@@ -33,19 +33,9 @@
 Index: linux.git/include/asm-mips/mach-generic/ide.h
 ===================================================================
 --- linux.git.orig/include/asm-mips/mach-generic/ide.h	2006-01-24 22:07:36.000000000 +0000
-+++ linux.git/include/asm-mips/mach-generic/ide.h	2006-01-24 22:10:43.000000000 +0000
-@@ -20,17 +20,9 @@
- #include <linux/stddef.h>
- #include <asm/processor.h>
- 
--#ifndef MAX_HWIFS
--# ifdef CONFIG_BLK_DEV_IDEPCI
--#define MAX_HWIFS	10
--# else
--#define MAX_HWIFS	6
--# endif
--#endif
--
++++ linux.git/include/asm-mips/mach-generic/ide.h	2006-01-24 23:41:19.000000000 +0000
+@@ -30,7 +30,7 @@
+ 
  #define IDE_ARCH_OBSOLETE_DEFAULTS
  
 -static __inline__ int ide_probe_legacy(void)
@@ -53,7 +43,7 @@
  {
  #ifdef CONFIG_PCI
  	struct pci_dev *dev;
-@@ -38,11 +30,11 @@
+@@ -38,11 +38,11 @@
  	    (dev = pci_get_class(PCI_CLASS_BRIDGE_ISA << 8, NULL)) != NULL) {
  		pci_dev_put(dev);
  
@@ -67,7 +57,7 @@
  #else
  	return 0;
  #endif
-@@ -50,30 +42,26 @@
+@@ -50,30 +50,26 @@
  
  static __inline__ int ide_default_irq(unsigned long base)
  {
@@ -114,7 +104,7 @@
  		switch (index) {
  		case 0:
  			return 0x1f0;
-@@ -87,11 +75,8 @@
+@@ -87,11 +83,8 @@
  			return 0x1e0;
  		case 5:
  			return 0x160;