Changeset da68871a in mainline for uspace/Makefile

Timestamp:

2012-08-08T08:46:22Z (12 years ago)

Author:

Adam Hraska <adam.hraska+hos@…>

Branches:

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

Children:

30c0826

Parents:

bc216a0 (diff), 1d01cca (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:

Merged changes from mainline.

File:

• uspace/Makefile (modified) (4 diffs)

uspace/Makefile

@@ -47 +47 @@
         app/klog \
         app/loc \
-        app/lsusb \
         app/mkfat \
         app/mkexfat \
@@ -85 +84 @@
         srv/vfs \
         srv/bd/ata_bd \
+        srv/bd/sata_bd \
         srv/bd/file_bd \
         srv/bd/gxe_bd \
@@ -105 +105 @@
         drv/infrastructure/root \
         drv/infrastructure/rootvirt \
+        drv/block/ahci \
         drv/char/i8042 \
         drv/char/ps2mouse \
@@ -169 +170 @@
         DIRS += \
                 drv/infrastructure/rootmac \
+                drv/bus/pci/pciintel \
                 srv/hw/bus/cuda_adb
 endif