aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/Kconfig
diff options
context:
space:
mode:
authorAl Viro <viro@www.linux.org.uk>2005-04-24 15:28:35 -0400
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-04-24 15:28:35 -0400
commit461790f79028ee9bfc3dd9d9afccc7e264aff9c7 (patch)
treedf42b2cb77406e1ce83312410889f9d95133322b /drivers/block/Kconfig
parenta62e7cef1aef9f98bddd92b8f9f8f3c2fb25037b (diff)
[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: Al Viro <viro@parcelfarce.linux.theplanet.co.uk> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/block/Kconfig')
-rw-r--r--drivers/block/Kconfig2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index e830be1a3ae6..e43e02328968 100644
--- a/drivers/block/Kconfig
+++ b/drivers/block/Kconfig
@@ -6,7 +6,7 @@ menu "Block devices"
6 6
7config BLK_DEV_FD 7config BLK_DEV_FD
8 tristate "Normal floppy disk support" 8 tristate "Normal floppy disk support"
9 depends on (!ARCH_S390 && !M68K && !IA64 && !UML) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285 9 depends on (!ARCH_S390 && !M68K && !IA64 && !UML && !ARM) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285
10 ---help--- 10 ---help---
11 If you want to use the floppy disk drive(s) of your PC under Linux, 11 If you want to use the floppy disk drive(s) of your PC under Linux,
12 say Y. Information about this driver, especially important for IBM 12 say Y. Information about this driver, especially important for IBM