Subject: Re: [patch 01/16] remove inclusion of asm/processor.h for powerpc

From: Sascha Hauer <[email-masked]>
Date: Fri, 3 Nov 2006 09:42:38 +0100

On Fri, Nov 03, 2006 at 09:20:20AM +1100, Benjamin Herrenschmidt wrote:
> On Thu, 2006-11-02 at 13:55 +0100, [email-masked] wrote:
> > plain text document attachment
> > (drivers-ide-pci-via82xxx-remove-ppc-ifdef.diff)
> > Remove inclusion of asm/processor.h for powerpc. It was used for
> > some ppc specific hook in this file, but the hook is gone
> 
> It's not:
> 
> init_hwif_via82cxxx() contains:
> 
> #if defined(CONFIG_PPC_CHRP) && defined(CONFIG_PPC32)
>         if(machine_is(chrp) && _chrp_type == _CHRP_Pegasos) {
>                 hwif->irq = hwif->channel ? 15 : 14;
>         }
> #endif
> 
> Now you can replace CONFIG_PPC_MULTIPLATFORM with CONFIG_PPC_CHRP
> 

Oops, missed that one. Here is an updated version:

Remove inclusion of asm/processor.h for powerpc. It was used for
some ppc specific hook in this file, but the hook is gone

Signed-off-by: Sascha Hauer <[email-masked]>

Index: drivers/ide/pci/via82cxxx.c
===================================================================
--- drivers/ide/pci/via82cxxx.c.orig
+++ 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_via82cxx
 	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;
 	}

-- 
 Dipl.-Ing. Sascha Hauer | http://www.pengutronix.de
  Pengutronix - Linux Solutions for Science and Industry
    Handelsregister: Amtsgericht Hildesheim, HRA 2686
      Hannoversche Str. 2, 31134 Hildesheim, Germany
    Phone: +49-5121-206917-0 |  Fax: +49-5121-206917-9