Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=edfedbf0cd0a57b16b638275e8fe8c369580b726
Commit:     edfedbf0cd0a57b16b638275e8fe8c369580b726
Parent:     b142eb3a5aa4f4779597b7a913c002287fa6ee08
Author:     Paul Mackerras <[EMAIL PROTECTED]>
AuthorDate: Tue Apr 24 13:57:12 2007 +1000
Committer:  Paul Mackerras <[EMAIL PROTECTED]>
CommitDate: Tue Apr 24 13:57:12 2007 +1000

    [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 <[EMAIL PROTECTED]>
---
 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 8cc5423..a508550 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;
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to