diff options
| author |   Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
|---|---|---|
| committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-03-31 15:34:58 -0500 |
| commit | 86579dd06deecfa6ac88d5e84e4d63c397cd6f6d (patch) | |
| tree | b4475d3ccde53015ad84a06e4e55e64591171b75 /drivers/ide/pci/via82cxxx.c | |
| parent | [GFS2] Update ioctl() to new interface (diff) | |
| parent | [PATCH] splice exports (diff) | |
| download | linux-dev-86579dd06deecfa6ac88d5e84e4d63c397cd6f6d.tar.xz linux-dev-86579dd06deecfa6ac88d5e84e4d63c397cd6f6d.zip | |
Merge branch 'master'
Diffstat (limited to 'drivers/ide/pci/via82cxxx.c')
| -rw-r--r-- | drivers/ide/pci/via82cxxx.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c index c85b87cb59d1..3e677c4f8c28 100644 --- a/drivers/ide/pci/via82cxxx.c +++ b/drivers/ide/pci/via82cxxx.c @@ -440,7 +440,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif) #if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32) - if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) { + if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) { hwif->irq = hwif->channel ? 15 : 14; } #endif |