Changeset 82d56184 in mainline for kernel/genarch/src/drivers/ega/ega.c

Timestamp:

2011-06-01T21:05:19Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

5cac9cd

Parents:

682cfceb (diff), 5d1b3aa (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:

• kernel/genarch/src/drivers/ega/ega.c (modified) (1 diff)

kernel/genarch/src/drivers/ega/ega.c

@@ -41 +41 @@
 #include <mm/slab.h>
 #include <arch/mm/page.h>
-#include <synch/spinlock.h>
 #include <typedefs.h>
 #include <arch/asm.h>