--- arch/ia64/config.in.bak	Wed Aug 28 10:25:07 2002
+++ arch/ia64/config.in	Wed Aug 28 10:20:29 2002
@@ -136,7 +136,64 @@
 if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
   source drivers/mtd/Config.in
   source drivers/pnp/Config.in
-  source drivers/block/Config.in
+fi
+
+#
+# Block device driver configuration
+#
+mainmenu_option next_comment
+comment 'Block devices'
+
+if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
+  tristate 'Normal PC 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' CONFIG_BLK_DEV_UMEM $CONFIG_PCI $CONFIG_EXPERIMENTAL
+fi # !HP_SIM
+
+  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
+
+endmenu
+
+
+if [ "$CONFIG_IA64_HP_SIM" = "n" ]; then
   source drivers/ieee1394/Config.in
   source drivers/message/i2o/Config.in
   source drivers/md/Config.in
@@ -154,18 +211,7 @@
     define_bool CONFIG_BLK_DEV_HD n
   fi
   endmenu
-else # HP_SIM
-  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
-  endmenu
-fi # HP_SIM
+fi # !HP_SIM
 
 mainmenu_option next_comment
 comment 'SCSI support'