aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorOlaf Hering <olaf@aepfle.de>2007-04-04 12:20:04 -0400
committerPaul Mackerras <paulus@samba.org>2007-04-12 14:00:25 -0400
commite48059225c2edc6f1e5a2008261f1efdf606f247 (patch)
treee4c3bc21bc53b0014dfa8a0c1982f84a3e55b028 /drivers
parent9c1a2bae0cc52b21121ea2380a2db0294ad0d8e7 (diff)
[POWERPC] Add correct interrupt property for pegasos ide
The firmware assigns irq 20/21 to the VIA IDE device on Pegasos. But the required interrupt is 14/15. Maybe someone confused decimal vs. hexadecimal values. Signed-off-by: Olaf Hering <olaf@aepfle.de> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/ide/pci/via82cxxx.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index a508550c4095..8cc5423892ac 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -35,10 +35,6 @@
35#include <linux/ide.h> 35#include <linux/ide.h>
36#include <asm/io.h> 36#include <asm/io.h>
37 37
38#ifdef CONFIG_PPC_CHRP
39#include <asm/processor.h>
40#endif
41
42#include "ide-timing.h" 38#include "ide-timing.h"
43 39
44#define DISPLAY_VIA_TIMINGS 40#define DISPLAY_VIA_TIMINGS
@@ -436,13 +432,6 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
436 hwif->tuneproc = &via82cxxx_tune_drive; 432 hwif->tuneproc = &via82cxxx_tune_drive;
437 hwif->speedproc = &via_set_drive; 433 hwif->speedproc = &via_set_drive;
438 434
439
440#ifdef CONFIG_PPC_CHRP
441 if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
442 hwif->irq = hwif->channel ? 15 : 14;
443 }
444#endif
445
446 for (i = 0; i < 2; i++) { 435 for (i = 0; i < 2; i++) {
447 hwif->drives[i].io_32bit = 1; 436 hwif->drives[i].io_32bit = 1;
448 hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1; 437 hwif->drives[i].unmask = (vdev->via_config->flags & VIA_NO_UNMASK) ? 0 : 1;