Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 74a9d5f1 authored by Sascha Hauer's avatar Sascha Hauer Committed by Paul Mackerras
Browse files

[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: default avatarSascha Hauer <s.hauer@pengutronix.de>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 36ca4ba4

drivers/ide/pci/via82cxxx.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

	}