Changeset ebb1489 in mainline for meson/arch/amd64/meson.build

Timestamp:

2024-10-13T08:23:40Z (2 months ago)

Author:

GitHub <noreply@…>

Children:

0472cf17

Parents:

2a0c827c (diff), b3b79981 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2024-10-13 08:23:40)

git-committer:

GitHub <noreply@…> (2024-10-13 08:23:40)

Message:

Merge branch 'HelenOS:master' into topic/packet-capture

File:

• meson/arch/amd64/meson.build (modified) (2 diffs)

meson/arch/amd64/meson.build

@@ -62 +62 @@
         'drv/intctl/i8259',
         'drv/platform/pc',
-        'drv/block/ata_bd',
+        'drv/block/isa-ide',
         'drv/bus/pci/pciintel',
         'drv/bus/isa',
@@ -76 +76 @@
         'drv/audio/sb16',
         'drv/block/ahci',
-        'drv/block/ata_bd',
+        'drv/block/isa-ide',
+        'drv/block/pc-floppy',
+        'drv/block/pci-ide',
         'drv/block/usbmast',
         'drv/block/virtio-blk',