bitkeeper revision 1.228 (3ec25028MO9vxogXKMc4ck8ORf6Dfg)

config.in:
  Moved useful bits of drivers/block/Config.in to xeno-specific config script.
.del-Config.in~a5023a9c38cac636:
  Delete: xenolinux-2.4.21-pre4-sparse/drivers/block/Config.in

3 files changed, 17 insertions, 57 deletions

diff --git a/.rootkeys b/.rootkeys
index e38544e860..f0a3ff39f8 100644
--- a/.rootkeys
+++ b/.rootkeys
@@ -448,7 +448,6 @@
 3e5a4e661gLzzff25pJooKIIWe7IWg xenolinux-2.4.21-pre4-sparse/arch/xeno/mm/init.c
 3e5a4e66U45cAIoHmxg0y1e1XhzVCA xenolinux-2.4.21-pre4-sparse/arch/xeno/mm/mmu_context.c
 3e5a4e66qRlSTcjafidMB6ulECADvg xenolinux-2.4.21-pre4-sparse/arch/xeno/vmlinux.lds
-3e5a4e668yELUdtr3HiJZBIqxqUyuA xenolinux-2.4.21-pre4-sparse/drivers/block/Config.in
 3ea53c6em6uzVHSiGqrbbAVofyRY_g xenolinux-2.4.21-pre4-sparse/drivers/block/genhd.c
 3e5a4e66mrtlmV75L1tjKDg8RaM5gA xenolinux-2.4.21-pre4-sparse/drivers/block/ll_rw_blk.c
 3eb7cc90LCRDzdNiLIt20dkBbAwVKQ xenolinux-2.4.21-pre4-sparse/drivers/char/Makefile
diff --git a/xenolinux-2.4.21-pre4-sparse/arch/xeno/config.in b/xenolinux-2.4.21-pre4-sparse/arch/xeno/config.in
index 717ae0c605..6ae2bca111 100644
--- a/xenolinux-2.4.21-pre4-sparse/arch/xeno/config.in
+++ b/xenolinux-2.4.21-pre4-sparse/arch/xeno/config.in
@@ -103,10 +103,26 @@ if [ "$CONFIG_NET" = "y" ]; then
    source net/Config.in
 fi
 
-source drivers/block/Config.in
+
+#
+# Block device driver configuration
+#
+mainmenu_option next_comment
+comment 'Block devices'
+tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
+dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
+tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
+if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
+   int '  Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096
+fi
+dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM
+bool 'Per partition statistics in /proc/partitions' CONFIG_BLK_STATS
+bool 'XenoLinux virtual block device support' CONFIG_XENOLINUX_BLOCK
+endmenu
 define_bool CONFIG_BLK_DEV_IDE_MODES n
 define_bool CONFIG_BLK_DEV_HD n
 
+
 mainmenu_option next_comment
 comment 'Character devices'
 
diff --git a/xenolinux-2.4.21-pre4-sparse/drivers/block/Config.in b/xenolinux-2.4.21-pre4-sparse/drivers/block/Config.in
deleted file mode 100644
index 73413fecb0..0000000000
--- a/xenolinux-2.4.21-pre4-sparse/drivers/block/Config.in
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Block device driver configuration
-#
-mainmenu_option next_comment
-comment 'Block devices'
-
-tristate 'Normal floppy disk support' CONFIG_BLK_DEV_FD
-if [ "$CONFIG_AMIGA" = "y" ]; then
-   tristate 'Amiga floppy support' CONFIG_AMIGA_FLOPPY
-fi
-if [ "$CONFIG_ATARI" = "y" ]; then
-   tristate 'Atari floppy support' CONFIG_ATARI_FLOPPY
-fi
-if [ "$CONFIG_MAC" = "y" ]; then
-   dep_bool 'Macintosh IIfx/Quadra 900/Quadra 950 floppy support (EXPERIMENTAL)' CONFIG_BLK_DEV_SWIM_IOP $CONFIG_EXPERIMENTAL
-fi
-if [ "$CONFIG_MCA" = "y" ]; then
-   tristate 'PS/2 ESDI hard disk support' CONFIG_BLK_DEV_PS2
-fi
-if [ "$CONFIG_ZORRO" = "y" ]; then
-   tristate 'Amiga Zorro II ramdisk support' CONFIG_AMIGA_Z2RAM
-fi
-if [ "$CONFIG_ATARI" = "y" ]; then
-   tristate 'Atari ACSI support' CONFIG_ATARI_ACSI
-   if [ "$CONFIG_ATARI_ACSI" != "n" ]; then
-      comment 'Some devices (e.g. CD jukebox) support multiple LUNs'
-      bool '  Probe all LUNs on each ACSI device' CONFIG_ACSI_MULTI_LUN
-      tristate '  Atari SLM laser printer support' CONFIG_ATARI_SLM
-   fi
-fi
-dep_tristate 'XT hard disk support' CONFIG_BLK_DEV_XD $CONFIG_ISA
-dep_tristate 'Parallel port IDE device support' CONFIG_PARIDE $CONFIG_PARPORT
-if [ "$CONFIG_PARIDE" = "y" -o "$CONFIG_PARIDE" = "m" ]; then
-   source drivers/block/paride/Config.in
-fi
-dep_tristate 'Compaq SMART2 support' CONFIG_BLK_CPQ_DA $CONFIG_PCI
-dep_tristate 'Compaq Smart Array 5xxx support' CONFIG_BLK_CPQ_CISS_DA $CONFIG_PCI 
-dep_mbool '       SCSI tape drive support for Smart Array 5xxx' CONFIG_CISS_SCSI_TAPE $CONFIG_BLK_CPQ_CISS_DA $CONFIG_SCSI
-dep_tristate 'Mylex DAC960/DAC1100 PCI RAID Controller support' CONFIG_BLK_DEV_DAC960 $CONFIG_PCI
-dep_tristate 'Micro Memory MM5415 Battery Backed RAM support (EXPERIMENTAL)' CONFIG_BLK_DEV_UMEM $CONFIG_PCI $CONFIG_EXPERIMENTAL
-
-tristate 'Loopback device support' CONFIG_BLK_DEV_LOOP
-dep_tristate 'Network block device support' CONFIG_BLK_DEV_NBD $CONFIG_NET
-
-tristate 'RAM disk support' CONFIG_BLK_DEV_RAM
-if [ "$CONFIG_BLK_DEV_RAM" = "y" -o "$CONFIG_BLK_DEV_RAM" = "m" ]; then
-   int '  Default RAM disk size' CONFIG_BLK_DEV_RAM_SIZE 4096
-fi
-dep_bool '  Initial RAM disk (initrd) support' CONFIG_BLK_DEV_INITRD $CONFIG_BLK_DEV_RAM
-
-bool 'Per partition statistics in /proc/partitions' CONFIG_BLK_STATS
-
-bool 'XenoLinux virtual block device support' CONFIG_XENOLINUX_BLOCK
-
-endmenu