Changeset 03362fbd in mainline for uspace/srv/hw/irc/i8259/i8259.c


Ignore:
Timestamp:
2013-02-09T23:14:45Z (13 years ago)
Author:
Jan Vesely <jano.vesely@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
22dfd38
Parents:
b5d2e57 (diff), 005b765 (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.

Conflict resulting from bool.h → stdbool.h move and ddf structs turning opaque.
Fails to boot to shell console.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • uspace/srv/hw/irc/i8259/i8259.c

    rb5d2e57 r03362fbd  
    4242#include <as.h>
    4343#include <ddi.h>
    44 #include <libarch/ddi.h>
    4544#include <align.h>
    46 #include <bool.h>
     45#include <stdbool.h>
    4746#include <errno.h>
    4847#include <async.h>
Note: See TracChangeset for help on using the changeset viewer.