From 3be66045c525627b29b4fa7e6b2fe56a87312a38 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 24 Apr 2005 12:28:35 -0700 Subject: [PATCH] --- yaml --- r: 395 b: refs/heads/master c: 461790f79028ee9bfc3dd9d9afccc7e264aff9c7 h: refs/heads/master i: 393: d4cb8c2f1232023adb1615b8a23db51cc90b15e7 391: 9adfb3a4faf57dd61a7df0023f1dcf0d5e1c7075 v: v3 --- [refs] | 2 +- trunk/drivers/block/Kconfig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 3e1418b3623c..1b14e3bcd87e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a62e7cef1aef9f98bddd92b8f9f8f3c2fb25037b +refs/heads/master: 461790f79028ee9bfc3dd9d9afccc7e264aff9c7 diff --git a/trunk/drivers/block/Kconfig b/trunk/drivers/block/Kconfig index e830be1a3ae6..e43e02328968 100644 --- a/trunk/drivers/block/Kconfig +++ b/trunk/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