Changeset 12d7710 in mainline for kernel/genarch/src/fb/fb.c


Ignore:
Timestamp:
2010-03-26T22:01:28Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
1faa995
Parents:
4204ad9 (diff), eaf22d4 (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/genarch/src/fb/fb.c

    r4204ad9 r12d7710  
    4949#include <bitops.h>
    5050#include <print.h>
    51 #include <string.h>
     51#include <str.h>
    5252#include <ddi/ddi.h>
    53 #include <arch/types.h>
     53#include <typedefs.h>
    5454#include <byteorder.h>
    5555
Note: See TracChangeset for help on using the changeset viewer.