Skip to content

Commit

Permalink
powerpc: Fix build error with CONFIG_PCI=n
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Pranith Kumar authored and Michael Ellerman committed Sep 25, 2014
1 parent c913e5f commit 3484a31
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion arch/powerpc/Kconfig
View file
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ config SCHED_OMIT_FRAME_POINTER

config ARCH_MAY_HAVE_PC_FDC
bool
default !PPC_PSERIES || PCI
default PCI

config PPC_OF
def_bool y
Expand Down

0 comments on commit 3484a31

Please sign in to comment.