All devices now have the bus marked in their name;

The Settings dialog now correctly filters devices by bus;
Split the dual VLB/PCI graphics cards into VLB and PCI versions;
Device filtering is now done using the new device_is_valid() call that compares device flags to machine flags;
Moved the NCR-based SCSI controllers to the main branch;
Moved the NE1000 to the dev branch until it's finished.

src/video/vid_vga.c

@@ -192,7 +192,7 @@ void vga_add_status_info(char *s, int max_len, void *p)
 device_t vga_device =
 {
         "VGA",
-        0,
+        DEVICE_ISA,
 	0,
         vga_init,
         vga_close,
@@ -206,7 +206,7 @@ device_t vga_device =
 device_t trigem_unk_device =
 {
         "VGA",
-        0,
+        DEVICE_ISA,
 	0,
         trigem_unk_init,
         vga_close,