Changeset 26e7d6d in mainline for kernel/arch/ia64/include/istate.h


Ignore:
Timestamp:
2011-09-19T16:31:00Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a347a11
Parents:
3842a955 (diff), 086290d (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/arch/ia64/include/istate.h

    r3842a955 r26e7d6d  
    3636#define KERN_ia64_ISTATE_H_
    3737
     38#include <trace.h>
     39
     40#ifdef KERNEL
     41
    3842#include <arch/register.h>
    3943
    40 #ifdef KERNEL
    41 #include <typedefs.h>
    42 #include <trace.h>
    43 #else
    44 #include <sys/types.h>
    45 #define NO_TRACE
    46 #endif
     44#else /* KERNEL */
     45
     46#include <libarch/register.h>
     47
     48#endif /* KERNEL */
    4749
    4850typedef struct istate {
Note: See TracChangeset for help on using the changeset viewer.