Changeset d5a89a3 in mainline for uspace/drv/block/virtio-blk


Ignore:
Timestamp:
2019-02-11T22:31:04Z (7 years ago)
Author:
Matthieu Riolo <matthieu.riolo@…>
Children:
aaf9789c
Parents:
e3272101 (diff), 4805495 (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:

merging with upstream/master

Location:
uspace/drv/block/virtio-blk
Files:
3 added
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/drv/block/virtio-blk/Makefile

    re3272101 rd5a89a3  
    11#
    2 # Copyright (c) 2011 Martin Sucha
     2# Copyright (c) 2019 Jakub Jermar
    33# All rights reserved.
    44#
    … …  
    2727#
    2828
    29 USPACE_PREFIX = ../..
    30 BINARY = bnchmark
     29USPACE_PREFIX = ../../..
     30LIBS = drv scsi virtio
     31BINARY = virtio-blk
    3132
    3233SOURCES = \
    33         bnchmark.c
     34        virtio-blk.c
    3435
    3536include $(USPACE_PREFIX)/Makefile.common
Note: See TracChangeset for help on using the changeset viewer.