Ignore:
Timestamp:
2012-11-06T21:03:44Z (11 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
338810f
Parents:
de73242 (diff), 94795812 (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/drv/infrastructure/root/root.c

    rde73242 refdfebc  
    204204{
    205205        ddf_msg(LVL_DEBUG, "root_dev_add, device handle=%" PRIun,
    206             dev->handle);
     206            ddf_dev_get_handle(dev));
    207207
    208208        /*
     
    237237        printf(NAME ": HelenOS root device driver\n");
    238238
    239         ddf_log_init(NAME, LVL_ERROR);
     239        ddf_log_init(NAME);
    240240        return ddf_driver_main(&root_driver);
    241241}
Note: See TracChangeset for help on using the changeset viewer.