aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/ide
diff options
context:
space:
mode:
authorDavid Woodhouse <dwmw2@infradead.org>2006-01-10 00:16:22 -0500
committerPaul Mackerras <paulus@samba.org>2006-01-10 00:49:20 -0500
commit3b212db9217d02e623eaa12f41c9b5f8c6a99535 (patch)
tree5cf49bb1286da21e43439bb37f555dba0bf7d35a /drivers/ide
parent9d17a5c611a7462a41b06c75f661f4106d380a86 (diff)
[PATCH] powerpc: Some ppc compile fixes...
This gets most of the Fedora rawhide RPM building again, as long as I disable CHRP. Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/pci/via82cxxx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 86fb1e0286d3..c85b87cb59d1 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -439,7 +439,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
439 hwif->speedproc = &via_set_drive; 439 hwif->speedproc = &via_set_drive;
440 440
441 441
442#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32) 442#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
443 if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) { 443 if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) {
444 hwif->irq = hwif->channel ? 15 : 14; 444 hwif->irq = hwif->channel ? 15 : 14;
445 } 445 }