Changeset 03936831 in mainline for uspace/Makefile

Timestamp:

2017-10-20T09:16:55Z (7 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

1252e81

Parents:

fe1c48d (diff), 04efacc (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 to fix build

File:

• uspace/Makefile (modified) (2 diffs)

uspace/Makefile

@@ -135 +135 @@
         srv/hid/remcons \
         srv/hw/char/s3c24xx_uart \
-        srv/hw/irc/apic \
-        srv/hw/irc/i8259 \
         srv/hw/irc/obio \
         srv/hid/rfb \
@@ -170 +168 @@
         drv/fb/amdm37x_dispc \
         drv/fb/kfb \
+        drv/intctl/apic \
+        drv/intctl/i8259 \
         drv/intctl/icp-ic \
         drv/nic/ne2k \