diff options
| author | Paul Mackerras <paulus@samba.org> | 2007-04-24 05:57:12 +0200 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2007-04-24 05:57:12 +0200 |
| commit | edfedbf0cd0a57b16b638275e8fe8c369580b726 (patch) | |
| tree | b00ceb32f68dee0cc65173cd718c62ef4c4fb6e0 | |
| parent | Merge branch 'for-2.6.22' of master.kernel.org:/pub/scm/linux/kernel/git/arnd... (diff) | |
| download | linux-edfedbf0cd0a57b16b638275e8fe8c369580b726.tar.xz linux-edfedbf0cd0a57b16b638275e8fe8c369580b726.zip | |
[POWERPC] Partially revert "Add correct interrupt property for pegasos ide"
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>
| -rw-r--r-- | drivers/ide/pci/via82cxxx.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index 8cc5423892ac..a508550c4095 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c @@ -35,6 +35,10 @@ #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; |