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
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
block
/
Kconfig
diff --git
a/drivers/block/Kconfig
b/drivers/block/Kconfig
index
c44f27f
..
0e18df6
100644
(file)
--- a/
drivers/block/Kconfig
+++ b/
drivers/block/Kconfig
@@
-33,13
+33,6
@@
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
+285,14
@@
config BLK_DEV_NBD
If unsure, say N.
If unsure, say N.
-config BLK_DEV_
SX8
- tristate "Promise SATA SX8 support"
+config BLK_DEV_
CARMEL
+ tristate "Promise SATA SX8
(carmel)
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 controllers.
+ Promise SATA SX8
("carmel")
controllers.
- Use devices /dev/
sx8/$N and /dev/sx8
/$Np$M.
+ Use devices /dev/
carmel/$N and /dev/carmel
/$Np$M.
config BLK_DEV_RAM
tristate "RAM disk support"
config BLK_DEV_RAM
tristate "RAM disk support"