]> err.no Git - linux-2.6/commitdiff
[POWERPC] Partially revert "Add correct interrupt property for pegasos ide"
authorPaul Mackerras <paulus@samba.org>
Tue, 24 Apr 2007 03:57:12 +0000 (13:57 +1000)
committerPaul Mackerras <paulus@samba.org>
Tue, 24 Apr 2007 03:57:12 +0000 (13:57 +1000)
It turns out that commit e48059225c2edc6f1e5a2008261f1efdf606f247
breaks some existing systems that use the via82cxxx driver.  This
reverts the change to via82cxxx.c.

Signed-off-by: Paul Mackerras <paulus@samba.org>
drivers/ide/pci/via82cxxx.c

index 8cc5423892ac09365143f2f4aea9aad52cf1a6cd..a508550c4095cecb0a43ffb474ca4d94b531d30b 100644 (file)
 #include <linux/ide.h>
 #include <asm/io.h>
 
+#ifdef CONFIG_PPC_CHRP
+#include <asm/processor.h>
+#endif
+
 #include "ide-timing.h"
 
 #define DISPLAY_VIA_TIMINGS
@@ -432,6 +436,13 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
        hwif->tuneproc = &via82cxxx_tune_drive;
        hwif->speedproc = &via_set_drive;
 
+
+#ifdef CONFIG_PPC_CHRP
+       if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
+               hwif->irq = hwif->channel ? 15 : 14;
+       }
+#endif
+
        for (i = 0; i < 2; i++) {
                hwif->drives[i].io_32bit = 1;
                hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;