Index: /trunk/src/VBox/Devices/PC/BIOS/rombios.c
===================================================================
--- /trunk/src/VBox/Devices/PC/BIOS/rombios.c	(revision 35097)
+++ /trunk/src/VBox/Devices/PC/BIOS/rombios.c	(revision 35098)
@@ -728,12 +728,8 @@
     //
     // map between (bios hd id - 0x80) and ata channels and scsi disks.
-#ifdef VBOX_WITH_SCSI
-    Bit8u  hdcount, hdidmap[BX_MAX_ATA_DEVICES+BX_MAX_SCSI_DEVICES];
-#else
-    Bit8u  hdcount, hdidmap[BX_MAX_ATA_DEVICES];
-#endif
+    Bit8u  hdcount, hdidmap[BX_MAX_STORAGE_DEVICES];
 
     // map between (bios cd id - 0xE0) and ata channels
-    Bit8u  cdcount, cdidmap[BX_MAX_ATA_DEVICES];
+    Bit8u  cdcount, cdidmap[BX_MAX_STORAGE_DEVICES];
 
     // Buffer for DPTE table
@@ -2355,5 +2351,5 @@
 
   // hdidmap  and cdidmap init.
-  for (device=0; device<BX_MAX_ATA_DEVICES; device++) {
+  for (device=0; device<BX_MAX_STORAGE_DEVICES; device++) {
     write_byte(ebda_seg,&EbdaData->ata.hdidmap[device],BX_MAX_STORAGE_DEVICES);
     write_byte(ebda_seg,&EbdaData->ata.cdidmap[device],BX_MAX_STORAGE_DEVICES);