Update of /cvsroot/gc-linux/linux/drivers/block
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24035/drivers/block
Modified Files:
Kconfig Makefile
Log Message:
Merged 2.6.5
Index: Kconfig
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Kconfig,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Kconfig 14 Mar 2004 23:45:44 -0000 1.2
+++ Kconfig 24 Apr 2004 18:31:44 -0000 1.3
@@ -6,7 +6,7 @@
config BLK_DEV_FD
tristate "Normal floppy disk support"
- depends on (!X86_PC9800 && !ARCH_S390 && !M68K) || Q40 || (SUN3X && BROKEN)
+ depends on (!X86_PC9800 && !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
@@ -303,6 +303,15 @@
If unsure, say N.
+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 ("carmel") controllers.
+
+ Use devices /dev/carmel/$N and /dev/carmel/$Np$M.
+
config BLK_DEV_RAM
tristate "RAM disk support"
---help---
@@ -332,7 +341,7 @@
config BLK_DEV_INITRD
bool "Initial RAM disk (initrd) support"
- depends on BLK_DEV_RAM && BLK_DEV_RAM!=m
+ depends on BLK_DEV_RAM=y
help
The initial RAM disk is a RAM disk that is loaded by the boot loader
(loadlin or lilo) and that is mounted as root before the normal boot
Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/drivers/block/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile 14 Mar 2004 23:45:44 -0000 1.2
+++ Makefile 24 Apr 2004 18:31:44 -0000 1.3
@@ -41,3 +41,5 @@
obj-$(CONFIG_BLK_DEV_CRYPTOLOOP) += cryptoloop.o
obj-$(CONFIG_VIODASD) += viodasd.o
+obj-$(CONFIG_BLK_DEV_CARMEL) += carmel.o
+
|