Changeset 925a21e in mainline for kernel/arch/ia64/src/ia64.c


Ignore:
Timestamp:
2011-09-24T14:20:29Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
5bf76c1
Parents:
867e2555 (diff), 1ab4aca (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/src/ia64.c

    r867e2555 r925a21e  
    5050#include <userspace.h>
    5151#include <console/console.h>
    52 #include <proc/uarg.h>
     52#include <abi/proc/uarg.h>
    5353#include <syscall/syscall.h>
    5454#include <ddi/irq.h>
Note: See TracChangeset for help on using the changeset viewer.