Changeset 04803bf in mainline for kernel/arch/ia32/src/drivers/vesa.c

Timestamp:

2011-03-21T22:00:17Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

143932e3

Parents:

b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:

• kernel/arch/ia32/src/drivers/vesa.c (modified) (2 diffs)

kernel/arch/ia32/src/drivers/vesa.c

@@ -49 +49 @@
 #include <synch/spinlock.h>
 #include <arch/asm.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <memstr.h>
 #include <bitops.h>
@@ -70 +70 @@
 bool vesa_init(void)
 {
-        if ((vesa_width == 0xffff) || (vesa_height == 0xffff))
+        if ((vesa_width == 0xffffU) || (vesa_height == 0xffffU))
                 return false;