Changeset 15d0046 in mainline for kernel/generic/include/ipc/sysipc.h


Ignore:
Timestamp:
2014-09-12T13:22:33Z (11 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b20126
Parents:
8db09e4 (diff), 105d8d6 (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
  • kernel/generic/include/ipc/sysipc.h

    r8db09e4 r15d0046  
    5353    unsigned int);
    5454extern sysarg_t sys_ipc_hangup(sysarg_t);
    55 extern sysarg_t sys_irq_register(inr_t, devno_t, sysarg_t, irq_code_t *);
    56 extern sysarg_t sys_irq_unregister(inr_t, devno_t);
     55
     56extern sysarg_t sys_ipc_irq_subscribe(inr_t, devno_t, sysarg_t, irq_code_t *);
     57extern sysarg_t sys_ipc_irq_unsubscribe(inr_t, devno_t);
    5758
    5859#ifdef __32_BITS__
Note: See TracChangeset for help on using the changeset viewer.