[patch 01/16] remove inclusion of asm/processor.h for powerpc
Benjamin Herrenschmidt
benh at kernel.crashing.org
Fri Nov 3 09:20:20 EST 2006
On Thu, 2006-11-02 at 13:55 +0100, s.hauer at pengutronix.de 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
> Signed-off-by: Sascha Hauer <s.hauer at pengutronix.de>
>
> Index: linux-2.6/drivers/ide/pci/via82cxxx.c
> ===================================================================
> --- linux-2.6.orig/drivers/ide/pci/via82cxxx.c
> +++ linux-2.6/drivers/ide/pci/via82cxxx.c
> @@ -35,10 +35,6 @@
> #include <linux/ide.h>
> #include <asm/io.h>
>
> -#ifdef CONFIG_PPC_MULTIPLATFORM
> -#include <asm/processor.h>
> -#endif
> -
> #include "ide-timing.h"
>
> #define DISPLAY_VIA_TIMINGS
>
> --
> 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
> _______________________________________________
> Linuxppc-dev mailing list
> Linuxppc-dev at ozlabs.org
> https://ozlabs.org/mailman/listinfo/linuxppc-dev
More information about the Linuxppc-dev
mailing list