Changeset 5828554 in mainline for abi/include/abi/klog.h


Ignore:
Timestamp:
2014-01-19T14:37:22Z (10 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
cf982ff
Parents:
2f591127 (diff), 476f62c (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

  • abi/include/abi/klog.h

    r2f591127 r5828554  
    11/*
    2  * Copyright (c) 2012 Jakub Jermar
     2 * Copyright (c) 2014 Martin Sucha
    33 * All rights reserved.
    44 *
    … …  
    3636#define ABI_KLOG_H_
    3737
    38 enum {
    39         KLOG_UNKNOW,
     38typedef enum {
    4039        KLOG_WRITE,
    41         KLOG_UPDATE,
    42         KLOG_COMMAND
    43 };
     40        KLOG_READ
     41} klog_operation_t;
    4442
    4543#endif
Note: See TracChangeset for help on using the changeset viewer.