Changeset 76ca3f7 in mainline for kernel/generic/src/console/console.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/generic/src/console/console.c

    rb48ebd19 r76ca3f7  
    3939#include <synch/waitq.h>
    4040#include <synch/spinlock.h>
    41 #include <arch/types.h>
     41#include <typedefs.h>
    4242#include <ddi/irq.h>
    4343#include <ddi/ddi.h>
     
    5151#include <syscall/copy.h>
    5252#include <errno.h>
    53 #include <string.h>
     53#include <str.h>
    5454
    5555#define KLOG_PAGES    4
Note: See TracChangeset for help on using the changeset viewer.