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

Benjamin Herrenschmidt benh at kernel.crashing.org
Sun Nov 5 17:47:28 EST 2006


On Fri, 2006-11-03 at 09:52 +0100, Sascha Hauer wrote:
> I Sent a -p0 patch by accident, forget the last one.
> 
> 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 at pengutronix.de>

Acked-by: Benjamin Herrenschmidt <benh at kernel.crashing.org>

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




More information about the Linuxppc-dev mailing list