projects/linux·commit 461790f7

[PATCH] broken dependency for floppy on ARM

461790f7 · Al Viro <[email protected]> · 2005-04-24 12:28:35 -07:00

(!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: Al Viro <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>
Commit
461790f79028ee9bfc3dd9d9afccc7e264aff9c7
Parents
a62e7cef

Changes

1 files changed · +1 −1

FileStatusAddDelContent
drivers/block/Kconfigmodified+1−1View file

drivers/block/Kconfig

View file
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e830be1..e43e023 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -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) || ARCH_RPC || ARCH_EBSA285
+ depends on (!ARCH_S390 && !M68K && !IA64 && !UML && !ARM) || 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