Changeset 8fb1bf82 in mainline for uspace/srv/bd/file_bd/file_bd.c


Ignore:
Timestamp:
2010-11-25T13:42:50Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
8df8415
Parents:
a93d79a (diff), eb667613 (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/srv/bd/file_bd/file_bd.c

    ra93d79a r8fb1bf82  
    6060static FILE *img;
    6161
    62 static dev_handle_t dev_handle;
     62static devmap_handle_t devmap_handle;
    6363static fibril_mutex_t dev_lock;
    6464
    … …  
    8282                return -1;
    8383
    84         rc = devmap_device_register(argv[2], &dev_handle);
     84        rc = devmap_device_register(argv[2], &devmap_handle);
    8585        if (rc != EOK) {
    8686                devmap_hangup_phone(DEVMAP_DRIVER);
Note: See TracChangeset for help on using the changeset viewer.