Changeset 1bebadee in mainline for uspace/Makefile

Timestamp:

2012-07-18T11:11:29Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c5cbc1b7

Parents:

1f7da3b (diff), 730dce77 (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.

Message:

Merge mainline changes.

Conflict in uspace/lib/drv/generic/dev_iface.c:

Resolved by using c99 method for array initialization for ahci too.

AHCI drivers
kernel console tab completion

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -89 +89 @@
         srv/vfs \
         srv/bd/ata_bd \
+        srv/bd/sata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
@@ -110 +111 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/block/ahci \
         drv/char/i8042 \
         drv/char/ps2mouse \