From: Sascha Hauer <s.hauer@pengutronix.de>
Date: Fri, 3 Nov 2006 08:52:49 +0000 (+0100)
Subject: [PATCH] Remove inclusion of asm/processor.h in via82cxxx.c
X-Git-Tag: MMI-PSA29.97-13-9~44978^2~47^2~109^2~164
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=74a9d5f1d140adbeadd5ef319f162903090c3b83;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

[PATCH] Remove inclusion of asm/processor.h in via82cxxx.c

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

diff --git a/drivers/ide/pci/via82cxxx.c b/drivers/ide/pci/via82cxxx.c
index 2af634d7acf4..eb7ab112c050 100644
--- a/drivers/ide/pci/via82cxxx.c
+++ b/drivers/ide/pci/via82cxxx.c
@@ -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;
 	}