Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 461790f7 authored by Al Viro's avatar Al Viro Committed by Linus Torvalds
Browse files

[PATCH] broken dependency for floppy on ARM 



(!ARCH_S390 && !M68K && !IA64 && !UML) is obviously always true on ARM.

Intended behaviour for ARM is "absent unless we are on RiscPC or
EBSA285".  So what we want is added && !ARM in the first term - without
it the last part (|| ARCH_RPC || ARCH_EBSA285, that is) doesn't do
anything. 

Signed-off-by: default avatarAl Viro <viro@parcelfarce.linux.theplanet.co.uk>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent a62e7cef

drivers/block/Kconfig

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ menu "Block devices" 




config BLK_DEV_FD

config BLK_DEV_FD

	tristate "Normal floppy disk support"

	tristate "Normal floppy disk support"

	depends on (!ARCH_S390 && !M68K && !IA64 && !UML) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285

	depends on (!ARCH_S390 && !M68K && !IA64 && !UML && !ARM) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285

	---help---

	---help---

	  If you want to use the floppy disk drive(s) of your PC under Linux,

	  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

	  say Y. Information about this driver, especially important for IBM