OSDN Git Service

powerpc: Fix build error with CONFIG_PCI=n
authorPranith Kumar <bobby.prani@gmail.com>
Mon, 18 Aug 2014 21:13:41 +0000 (17:13 -0400)
committerMichael Ellerman <mpe@ellerman.id.au>
Thu, 25 Sep 2014 13:14:35 +0000 (23:14 +1000)
commit3484a31fce22348b9034024cf9368ab2dbbfd0ab
treeb0bd35c9c2d9ff2e95bafbddf979734b3bd94f51
parentc913e5f95e546d8d3a9f99ba9908f7e095cbc1fb
powerpc: Fix build error with CONFIG_PCI=n

Fix ppc 32 build failure as reported here:

http://kisskb.ellerman.id.au/kisskb/buildresult/11663513/

The error is as follows:

arch/powerpc/include/asm/floppy.h:142:20: error: 'isa_bridge_pcidev' undeclared
(first use in this function)

This is happening since floppy.o is enabled by BLK_DEV_FD which depends on
ARCH_MAY_HAVE_PC_FDC which is in-turn enabled if PPC_PSERIES=n.

The following commit changes the dependency so that ARCH_MAY_HAVE_PC_FDC is
dependent exclusively on PCI since otherwise it will not compile.

Signed-off-by: Pranith Kumar <bobby.prani@gmail.com>
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
CC: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/Kconfig