git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
drivers
/
block
/
Kconfig
diff --git
a/drivers/block/Kconfig
b/drivers/block/Kconfig
index
ecbc4e4
..
c44f27f
100644
(file)
--- a/
drivers/block/Kconfig
+++ b/
drivers/block/Kconfig
@@
-6,7
+6,7
@@
menu "Block devices"
config BLK_DEV_FD
tristate "Normal floppy disk support"
config BLK_DEV_FD
tristate "Normal floppy disk support"
- depends on (!
X86_PC9800 && !
ARCH_S390 && !M68K && !IA64) || Q40 || (SUN3X && BROKEN)
+ depends on (!ARCH_S390 && !M68K && !IA64) || Q40 || (SUN3X && BROKEN)
---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
---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
@@
-26,13
+26,6
@@
config ATARI_FLOPPY
tristate "Atari floppy support"
depends on ATARI
tristate "Atari floppy support"
depends on ATARI
-config BLK_DEV_FD98
- tristate "NEC PC-9800 floppy disk support"
- depends on X86_PC9800
- ---help---
- If you want to use the floppy disk drive(s) of NEC PC-9801/PC-9821,
- say Y.
-
config BLK_DEV_SWIM_IOP
bool "Macintosh IIfx/Quadra 900/Quadra 950 floppy support (EXPERIMENTAL)"
depends on MAC && EXPERIMENTAL && BROKEN
config BLK_DEV_SWIM_IOP
bool "Macintosh IIfx/Quadra 900/Quadra 950 floppy support (EXPERIMENTAL)"
depends on MAC && EXPERIMENTAL && BROKEN
@@
-40,6
+33,13
@@
config BLK_DEV_SWIM_IOP
Say Y here to support the SWIM (Super Woz Integrated Machine) IOP
floppy controller on the Macintosh IIfx and Quadra 900/950.
Say Y here to support the SWIM (Super Woz Integrated Machine) IOP
floppy controller on the Macintosh IIfx and Quadra 900/950.
+config MAC_FLOPPY
+ tristate "Support for PowerMac floppy"
+ depends on PPC_PMAC && !PPC_PMAC64
+ help
+ If you have a SWIM-3 (Super Woz Integrated Machine 3; from Apple)
+ floppy controller, say Y here. Most commonly found in PowerMacs.
+
config BLK_DEV_PS2
tristate "PS/2 ESDI hard disk support"
depends on MCA && MCA_LEGACY
config BLK_DEV_PS2
tristate "PS/2 ESDI hard disk support"
depends on MCA && MCA_LEGACY
@@
-292,14
+292,14
@@
config BLK_DEV_NBD
If unsure, say N.
If unsure, say N.
-config BLK_DEV_
CARMEL
- tristate "Promise SATA SX8
(carmel)
support"
+config BLK_DEV_
SX8
+ tristate "Promise SATA SX8 support"
depends on PCI
---help---
Saying Y or M here will enable support for the
depends on PCI
---help---
Saying Y or M here will enable support for the
- Promise SATA SX8
("carmel")
controllers.
+ Promise SATA SX8 controllers.
- Use devices /dev/
carmel/$N and /dev/carmel
/$Np$M.
+ Use devices /dev/
sx8/$N and /dev/sx8
/$Np$M.
config BLK_DEV_RAM
tristate "RAM disk support"
config BLK_DEV_RAM
tristate "RAM disk support"