aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorviro@ZenIV.linux.org.uk <viro@ZenIV.linux.org.uk>2005-09-05 20:48:42 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-09-07 20:17:12 -0400
commita08b6b7968e7a6afc75e365ac31830867275abdc (patch)
tree4c8bc7006f09eb01950cbf0d6854128cc969a486
parent8ae418cf85b92cae7bce3d810b6aaf354e77be84 (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>
-rw-r--r--arch/alpha/Kconfig3
-rw-r--r--arch/arm/Kconfig4
-rw-r--r--arch/arm/mach-footbridge/Kconfig1
-rw-r--r--arch/arm26/Kconfig4
-rw-r--r--arch/i386/Kconfig4
-rw-r--r--arch/m68k/Kconfig5
-rw-r--r--arch/mips/Kconfig5
-rw-r--r--arch/parisc/Kconfig4
-rw-r--r--arch/ppc/Kconfig4
-rw-r--r--arch/ppc64/Kconfig4
-rw-r--r--arch/sh/Kconfig4
-rw-r--r--arch/sparc/Kconfig4
-rw-r--r--arch/sparc64/Kconfig4
-rw-r--r--arch/x86_64/Kconfig4
-rw-r--r--drivers/block/Kconfig2
15 files changed, 55 insertions, 1 deletions
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 189d5eababa8..786491f9ceb2 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -479,6 +479,9 @@ config EISA
479 depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE 479 depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE
480 default y 480 default y
481 481
482config ARCH_MAY_HAVE_PC_FDC
483 def_bool y
484
482config SMP 485config SMP
483 bool "Symmetric multi-processing support" 486 bool "Symmetric multi-processing support"
484 depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL 487 depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL
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
64config GENERIC_BUST_SPINLOCK 64config GENERIC_BUST_SPINLOCK
65 bool 65 bool
66 66
67config ARCH_MAY_HAVE_PC_FDC
68 bool
69
67config GENERIC_ISA_DMA 70config 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.
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index 324d9edeec38..bdd257921cfb 100644
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -87,6 +87,7 @@ config FOOTBRIDGE_ADDIN
87 87
88# EBSA285 board in either host or addin mode 88# EBSA285 board in either host or addin mode
89config ARCH_EBSA285 89config ARCH_EBSA285
90 select ARCH_MAY_HAVE_PC_FDC
90 bool 91 bool
91 92
92endif 93endif
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index 1f0373267306..1f00b3d03a07 100644
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -55,6 +55,10 @@ config GENERIC_BUST_SPINLOCK
55config GENERIC_ISA_DMA 55config GENERIC_ISA_DMA
56 bool 56 bool
57 57
58config ARCH_MAY_HAVE_PC_FDC
59 bool
60 default y
61
58source "init/Kconfig" 62source "init/Kconfig"
59 63
60 64
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 4b7de3e1e57b..5d51b38bd70d 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -37,6 +37,10 @@ config GENERIC_IOMAP
37 bool 37 bool
38 default y 38 default y
39 39
40config ARCH_MAY_HAVE_PC_FDC
41 bool
42 default y
43
40source "init/Kconfig" 44source "init/Kconfig"
41 45
42menu "Processor type and features" 46menu "Processor type and features"
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 178c4a3fbb72..ba960bbc8e6d 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -25,6 +25,11 @@ config GENERIC_CALIBRATE_DELAY
25 bool 25 bool
26 default y 26 default y
27 27
28config ARCH_MAY_HAVE_PC_FDC
29 bool
30 depends on Q40 || (BROKEN && SUN3X)
31 default y
32
28mainmenu "Linux/68k Kernel Configuration" 33mainmenu "Linux/68k Kernel Configuration"
29 34
30source "init/Kconfig" 35source "init/Kconfig"
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d79fba0aa8bf..8d76eb1ff291 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -4,6 +4,11 @@ config MIPS
4 # Horrible source of confusion. Die, die, die ... 4 # Horrible source of confusion. Die, die, die ...
5 select EMBEDDED 5 select EMBEDDED
6 6
7# shouldn't it be per-subarchitecture?
8config ARCH_MAY_HAVE_PC_FDC
9 bool
10 default y
11
7mainmenu "Linux/MIPS Kernel Configuration" 12mainmenu "Linux/MIPS Kernel Configuration"
8 13
9source "init/Kconfig" 14source "init/Kconfig"
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 1c2d87435233..0b07922a2ac6 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -49,6 +49,10 @@ config ISA_DMA_API
49 bool 49 bool
50 default y 50 default y
51 51
52config ARCH_MAY_HAVE_PC_FDC
53 bool
54 default y
55
52source "init/Kconfig" 56source "init/Kconfig"
53 57
54 58
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 36dee0ff5ca0..6ab7e5ea5fcf 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -47,6 +47,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
47 bool 47 bool
48 default y 48 default y
49 49
50config ARCH_MAY_HAVE_PC_FDC
51 bool
52 default y
53
50source "init/Kconfig" 54source "init/Kconfig"
51 55
52menu "Processor" 56menu "Processor"
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 13b262f10216..deca68ad644a 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -44,6 +44,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
44 bool 44 bool
45 default y 45 default y
46 46
47config ARCH_MAY_HAVE_PC_FDC
48 bool
49 default y
50
47# We optimistically allocate largepages from the VM, so make the limit 51# We optimistically allocate largepages from the VM, so make the limit
48# large enough (16MB). This badly named config option is actually 52# large enough (16MB). This badly named config option is actually
49# max order + 1 53# max order + 1
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index adc8109f8b77..3e804c736e64 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -37,6 +37,10 @@ config GENERIC_CALIBRATE_DELAY
37 bool 37 bool
38 default y 38 default y
39 39
40config ARCH_MAY_HAVE_PC_FDC
41 bool
42 default y
43
40source "init/Kconfig" 44source "init/Kconfig"
41 45
42menu "System type" 46menu "System type"
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index aca028aa29bf..aba05394d30a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -211,6 +211,10 @@ config GENERIC_CALIBRATE_DELAY
211 bool 211 bool
212 default y 212 default y
213 213
214config ARCH_MAY_HAVE_PC_FDC
215 bool
216 default y
217
214config SUN_PM 218config SUN_PM
215 bool 219 bool
216 default y 220 default y
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 73ec6aec5ed5..1e9d8638a28a 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -26,6 +26,10 @@ config TIME_INTERPOLATION
26 bool 26 bool
27 default y 27 default y
28 28
29config ARCH_MAY_HAVE_PC_FDC
30 bool
31 default y
32
29choice 33choice
30 prompt "Kernel page size" 34 prompt "Kernel page size"
31 default SPARC64_PAGE_SIZE_8KB 35 default SPARC64_PAGE_SIZE_8KB
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 251ce7cf1a38..8f868b67ef0f 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -65,6 +65,10 @@ config GENERIC_IOMAP
65 bool 65 bool
66 default y 66 default y
67 67
68config ARCH_MAY_HAVE_PC_FDC
69 bool
70 default y
71
68source "init/Kconfig" 72source "init/Kconfig"
69 73
70 74
diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index 6b736364cc5b..51b0af1cebee 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 && !ARM) || Q40 || (SUN3X && BROKEN) || ARCH_RPC || ARCH_EBSA285 9 depends on ARCH_MAY_HAVE_PC_FDC
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