Update of /cvsroot/gc-linux/linux/drivers/block
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6711/drivers/block
Modified Files:
Kconfig Makefile
Log Message:
Merged 2.6.8{,.1}
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Kconfig 16 Jun 2004 17:30:43 -0000 1.5
+++ Kconfig 15 Aug 2004 22:33:04 -0000 1.6
@@ -6,7 +6,7 @@
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
@@ -26,13 +26,6 @@
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
@@ -40,6 +33,13 @@
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
@@ -310,14 +310,14 @@
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
- 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"
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Makefile 11 May 2004 17:48:35 -0000 1.5
+++ Makefile 15 Aug 2004 22:33:04 -0000 1.6
@@ -43,5 +43,5 @@
obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o
obj-$(CONFIG_VIODASD) += viodasd.o
-obj-$(CONFIG_BLK_DEV_CARMEL) += carmel.o
+obj-$(CONFIG_BLK_DEV_SX8) += sx8.o
|
