X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fblock%2FKconfig;h=0e18df6b76e546f0b0d21f8dd73ecfb4b3632643;hb=1be35e94e1da3669db492995cd2c8b1a37016b11;hp=c44f27f24847b7dfa6f441e82e99c1f43220ab9b;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/drivers/block/Kconfig b/drivers/block/Kconfig
index c44f27f24..0e18df6b7 100644
--- 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.
 
-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
@@ -292,14 +285,14 @@ config BLK_DEV_NBD
 
 	  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 
-	  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"