diff options
author | viro@ZenIV.linux.org.uk <viro@ZenIV.linux.org.uk> | 2005-09-05 20:48:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-07 20:17:12 -0400 |
commit | a08b6b7968e7a6afc75e365ac31830867275abdc (patch) | |
tree | 4c8bc7006f09eb01950cbf0d6854128cc969a486 /arch/arm/Kconfig | |
parent | 8ae418cf85b92cae7bce3d810b6aaf354e77be84 (diff) |
[PATCH] Kconfig fix (BLK_DEV_FD dependencies)
Sanitized and fixed floppy dependencies: split the messy dependencies for
BLK_DEV_FD by introducing a new symbol (ARCH_MAY_HAVE_PC_FDC), making
BLK_DEV_FD depend on that one and taking declarations of ARCH_MAY_HAVE_PC_FDC
to arch/*/Kconfig. While we are at it, fixed several obvious cases when
BLK_DEV_FD should have been excluded (architectures lacking asm/floppy.h
are *not* going to have floppy.c compile, let alone work).
If you can come up with better name for that ("this architecture might
have working PC-compatible floppy disk controller"), you are more than
welcome - just s/ARCH_MAY_HAVE_PC_FDC/your_prefered_name/g in the patch
below...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/arm/Kconfig')
-rw-r--r-- | arch/arm/Kconfig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 68dfdba71d74..0f2899b4159d 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -64,6 +64,9 @@ config GENERIC_CALIBRATE_DELAY | |||
64 | config GENERIC_BUST_SPINLOCK | 64 | config GENERIC_BUST_SPINLOCK |
65 | bool | 65 | bool |
66 | 66 | ||
67 | config ARCH_MAY_HAVE_PC_FDC | ||
68 | bool | ||
69 | |||
67 | config GENERIC_ISA_DMA | 70 | config GENERIC_ISA_DMA |
68 | bool | 71 | bool |
69 | 72 | ||
@@ -150,6 +153,7 @@ config ARCH_RPC | |||
150 | select ARCH_ACORN | 153 | select ARCH_ACORN |
151 | select FIQ | 154 | select FIQ |
152 | select TIMER_ACORN | 155 | select TIMER_ACORN |
156 | select ARCH_MAY_HAVE_PC_FDC | ||
153 | help | 157 | help |
154 | On the Acorn Risc-PC, Linux can support the internal IDE disk and | 158 | On the Acorn Risc-PC, Linux can support the internal IDE disk and |
155 | CD-ROM interface, serial and parallel port, and the floppy drive. | 159 | CD-ROM interface, serial and parallel port, and the floppy drive. |