Skip to content

Commit

Permalink
[PATCH] Remove inclusion of asm/processor.h in via82cxxx.c
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Sascha Hauer authored and Paul Mackerras committed Nov 13, 2006
1 parent 36ca4ba commit 74a9d5f
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/ide/pci/via82cxxx.c
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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;
}
Expand Down

0 comments on commit 74a9d5f

Please sign in to comment.