Changeset 76ca3f7 in mainline for kernel/arch/ia64/src/drivers/ski.c


Ignore:
Timestamp:
2010-03-23T20:49:54Z (15 years ago)
Author:
Lukas Mejdrech <lukasmejdrech@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
e417b96
Parents:
b48ebd19 (diff), 63f8966 (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 mailnline changes, revision 329

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/ia64/src/drivers/ski.c

    rb48ebd19 r76ca3f7  
    3737#include <console/chardev.h>
    3838#include <sysinfo/sysinfo.h>
    39 #include <arch/types.h>
     39#include <typedefs.h>
    4040#include <proc/thread.h>
    4141#include <synch/spinlock.h>
    4242#include <arch/asm.h>
    4343#include <arch/drivers/kbd.h>
    44 #include <string.h>
     44#include <str.h>
    4545#include <arch.h>
    4646
Note: See TracChangeset for help on using the changeset viewer.