Changeset efedee77 in mainline for kernel/generic/include/ddi/ddi.h


Ignore:
Timestamp:
2010-11-02T22:38:46Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
af894a21
Parents:
aab02fb (diff), e06ef614 (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/ddi/ddi.h

    raab02fb refedee77  
    5454extern unative_t sys_physmem_map(unative_t, unative_t, unative_t, unative_t);
    5555extern unative_t sys_iospace_enable(ddi_ioarg_t *);
    56 extern unative_t sys_preempt_control(int);
     56extern unative_t sys_interrupt_enable(int irq, int enable);
    5757
    5858/*
    … …  
    6161extern int ddi_iospace_enable_arch(task_t *, uintptr_t, size_t);
    6262
     63
    6364#endif
    6465
Note: See TracChangeset for help on using the changeset viewer.