[PATCH] Fix floppy disk dependencies

[PATCH] Fix floppy disk dependencies

[Russell King]

Both the RiscPC and (optionally) EBSA285 have floppy disk
support.  Allow this option to be selected on these ARM
platforms again.

Signed-off-by: Russell King <rmk@arm.linux.org.uk>

diff -up -x BitKeeper -x ChangeSet -x SCCS -x _xlk -x '*.orig' -x '*.rej' -r orig/drivers/block/Kconfig linux/drivers/block/Kconfig
--- orig/drivers/block/Kconfig	Mon Apr  4 22:53:23 2005
+++ linux/drivers/block/Kconfig	Mon Apr  4 23:42:07 2005
@@ -6,7 +6,7 @@ menu "Block devices"
 
 config BLK_DEV_FD
 	tristate "Normal floppy disk support"
-	depends on (!ARCH_S390 && !M68K && !IA64 && !UML) || Q40 || (SUN3X && BROKEN)
+	depends on (!ARCH_S390 && !M68K && !IA64 && !UML) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285
 	---help---
 	  If you want to use the floppy disk drive(s) of your PC under Linux,
 	  say Y. Information about this driver, especially important for IBM

Re: [PATCH] Fix floppy disk dependencies

[Al Viro]

On Mon, Apr 11, 2005 at 11:15:20PM +0100, Russell King wrote:
> Both the RiscPC and (optionally) EBSA285 have floppy disk
> support.  Allow this option to be selected on these ARM
> platforms again.

I think it's a wrong approach.  Instead of this collection of
dependencies we should bite the bullet and put

config HAS_GENERIC_FDC
	bool
	default y

in arch/*/Kconfig of platforms that do have it and

config BLK_DEV_FD
	tristate "Normal floppy disk support"
        depends on HAS_GENERIC_FDC

in drivers/block/Kconfig.  That way we can express such dependencies
sanely without bringing all the gory details in one pile.

I'll do that unless there are serious objections...