Changeset 2b95d13 in mainline for uspace/Makefile


Ignore:
Timestamp:
2013-03-12T21:07:15Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
606f6a1
Parents:
976c434 (diff), eceff5f (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.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/Makefile

    r976c434 r2b95d13  
    193193ifeq ($(UARCH),arm32)
    194194        DIRS += \
    195                 drv/infrastructure/rootamdm37x
     195                drv/infrastructure/rootamdm37x \
     196                drv/fb/amdm37x_dispc
    196197endif
    197198
Note: See TracChangeset for help on using the changeset viewer.