Commit a08b6b79 authored by viro@ZenIV.linux.org.uk's avatar viro@ZenIV.linux.org.uk Committed by Linus Torvalds
Browse files

[PATCH] Kconfig fix (BLK_DEV_FD dependencies) 



Sanitized and fixed floppy dependencies: split the messy dependencies for
BLK_DEV_FD by introducing a new symbol (ARCH_MAY_HAVE_PC_FDC), making
BLK_DEV_FD depend on that one and taking declarations of ARCH_MAY_HAVE_PC_FDC
to arch/*/Kconfig.  While we are at it, fixed several obvious cases when
BLK_DEV_FD should have been excluded (architectures lacking asm/floppy.h
are *not* going to have floppy.c compile, let alone work).

If you can come up with better name for that ("this architecture might
have working PC-compatible floppy disk controller"), you are more than
welcome - just s/ARCH_MAY_HAVE_PC_FDC/your_prefered_name/g in the patch
below...

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 8ae418cf

arch/alpha/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -479,6 +479,9 @@ config EISA 
	depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE

	default y



config ARCH_MAY_HAVE_PC_FDC

	def_bool y



config SMP

	bool "Symmetric multi-processing support"

	depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL

arch/arm/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -64,6 +64,9 @@ config GENERIC_CALIBRATE_DELAY 
config GENERIC_BUST_SPINLOCK

	bool



config ARCH_MAY_HAVE_PC_FDC

	bool



config GENERIC_ISA_DMA

	bool
@@ -150,6 +153,7 @@ config ARCH_RPC 
	select ARCH_ACORN

	select FIQ

	select TIMER_ACORN

	select ARCH_MAY_HAVE_PC_FDC

	help

	  On the Acorn Risc-PC, Linux can support the internal IDE disk and

	  CD-ROM interface, serial and parallel port, and the floppy drive.

arch/arm/mach-footbridge/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -87,6 +87,7 @@ config FOOTBRIDGE_ADDIN 


# EBSA285 board in either host or addin mode

config ARCH_EBSA285

	select ARCH_MAY_HAVE_PC_FDC

	bool



endif

arch/arm26/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ config GENERIC_BUST_SPINLOCK 
config GENERIC_ISA_DMA

	bool



config ARCH_MAY_HAVE_PC_FDC

	bool

	default y



source "init/Kconfig"

arch/i386/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,10 @@ config GENERIC_IOMAP 
	bool

	default y



config ARCH_MAY_HAVE_PC_FDC

	bool

	default y



source "init/Kconfig"



menu "Processor type and features"

CRA Git | Maintained and supported by SUSTech CRA and CCSE