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/hw/char/s3c24xx_uart/s3c24xx_uart.c

    rd70d80ed rea28272  
    116116        ipc_callid_t callid;
    117117        ipc_call_t call;
    118         ipcarg_t method;
     118        sysarg_t method;
    119119        int retval;
    120120
    … …  
    124124        while (1) {
    125125                callid = async_get_call(&call);
    126                 method = IPC_GET_METHOD(call);
     126                method = IPC_GET_IMETHOD(call);
    127127                switch (method) {
    128128                case IPC_M_PHONE_HUNGUP:
Note: See TracChangeset for help on using the changeset viewer.