[PATCH] Remove inclusion of asm/processor.h in via82cxxx.c
authorSascha Hauer <s.hauer@pengutronix.de>
Fri, 3 Nov 2006 08:52:49 +0000 (09:52 +0100)
committerPaul Mackerras <paulus@samba.org>
Mon, 13 Nov 2006 03:44:55 +0000 (14:44 +1100)
There is some PPC_CHRP specific code in drivers/ide/pci/via82cxxx.c,
so #ifdef on CONFIG_PPC_CHRP instead of CONFIG_PPC_MULTIPLATFORM.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
drivers/ide/pci/via82cxxx.c

index 2af634d7acf4a86de888b7077e037c5e5a4a0fe7..eb7ab112c05010fec0f9048ef2b8c1a837d62eb4 100644 (file)
@@ -35,7 +35,7 @@
 #include <linux/ide.h>
 #include <asm/io.h>
 
-#ifdef CONFIG_PPC_MULTIPLATFORM
+#ifdef CONFIG_PPC_CHRP
 #include <asm/processor.h>
 #endif
 
@@ -442,7 +442,7 @@ static void __devinit init_hwif_via82cxxx(ide_hwif_t *hwif)
        hwif->speedproc = &via_set_drive;
 
 
-#if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
+#ifdef CONFIG_PPC_CHRP
        if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
                hwif->irq = hwif->channel ? 15 : 14;
        }