Commit 7bda0fae authored by Alexander Viro's avatar Alexander Viro Committed by Linus Torvalds

[PATCH] via82cxxx: fix ppc32 multiplatform config test

PPC_MULTIPLATFORM exists both for ppc32 and ppc64; chrp and pegasos,
OTOH, are ppc32-only.  The ifdef in via82cxxx should be for
PPC_MULTIPLATFORM and PPC32 - it makes no sense for ppc64 multiplatform
and, as the matter of fact, simply won't compile there.
Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 0433d751
......@@ -589,7 +589,7 @@ static void __init init_hwif_via82cxxx(ide_hwif_t *hwif)
hwif->speedproc = &via_set_drive;
#ifdef CONFIG_PPC_MULTIPLATFORM
#if defined(CONFIG_PPC_MULTIPLATFORM) && defined(CONFIG_PPC32)
if(_machine == _MACH_chrp && _chrp_type == _CHRP_Pegasos) {
hwif->irq = hwif->channel ? 15 : 14;
}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment