Ignore:
Timestamp:
2010-12-30T13:43:27Z (14 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d770deb
Parents:
d70d80ed (diff), f418e51 (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/part/mbr_part/mbr_part.c

    rd70d80ed rea28272  
    393393        ipc_callid_t callid;
    394394        ipc_call_t call;
    395         ipcarg_t method;
     395        sysarg_t method;
    396396        devmap_handle_t dh;
    397397        int flags;
     
    438438        while (1) {
    439439                callid = async_get_call(&call);
    440                 method = IPC_GET_METHOD(call);
     440                method = IPC_GET_IMETHOD(call);
    441441                switch (method) {
    442442                case IPC_M_PHONE_HUNGUP:
Note: See TracChangeset for help on using the changeset viewer.