Changeset 1787e527 in mainline for kernel/genarch/include/drivers/ega/ega.h

Timestamp:

2009-11-16T21:22:54Z (15 years ago)

Author:

Lenka Trochtova <trochtova.lenka@…>

Branches:

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

Children:

5ebdf94

Parents:

fcbd1be (diff), 9c70ed6 (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:

merged with head (unstable)

File:

• kernel/genarch/include/drivers/ega/ega.h (modified) (2 diffs)

kernel/genarch/include/drivers/ega/ega.h

@@ -38 +38 @@
 #include <arch/types.h>
 #include <typedefs.h>
+#include <console/chardev.h>
 
 #define EGA_COLS       80
@@ -48 +49 @@
 #define EGA_DATA_REG   1
 
-extern void ega_redraw(void);
-extern void ega_init(ioport8_t *, uintptr_t);
+extern outdev_t *ega_init(ioport8_t *, uintptr_t);
 
 #endif