commit 3b212db9217d02e623eaa12f41c9b5f8c6a99535
author David Woodhouse <dwmw2@infradead.org> Tue Jan 10 05:16:22 2006 +0000
committer Paul Mackerras <paulus@samba.org> Tue Jan 10 16:49:20 2006 +1100
tree 5cf49bb1286da21e43439bb37f555dba0bf7d35a
parent 9d17a5c611a7462a41b06c75f661f4106d380a86

[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>

drivers/ide/pci/via82cxxx.c

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 86fb1e0..c85b87c 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -439,7 +439,7 @@
 	hwif->speedproc = &via_set_drive;
 
 
-#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32)
+#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
 	if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) {
 		hwif->irq = hwif->channel ? 15 : 14;
 	}