Changeset 6843a9c in mainline for kernel/generic/include/ipc/sysipc.h


Ignore:
Timestamp:
2012-06-29T13:02:14Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/generic/include/ipc/sysipc.h

    rba72f2b r6843a9c  
    5656    unsigned int);
    5757extern sysarg_t sys_ipc_hangup(sysarg_t);
    58 extern sysarg_t sys_register_irq(inr_t, devno_t, sysarg_t, irq_code_t *);
    59 extern sysarg_t sys_unregister_irq(inr_t, devno_t);
     58extern sysarg_t sys_irq_register(inr_t, devno_t, sysarg_t, irq_code_t *);
     59extern sysarg_t sys_irq_unregister(inr_t, devno_t);
    6060
    6161#ifdef __32_BITS__
Note: See TracChangeset for help on using the changeset viewer.