Changeset c621f4aa in mainline for kernel/genarch/src/fb/fb.c

Timestamp:

2010-07-25T10:11:13Z (16 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

377cce8

Parents:

24a2517 (diff), a2da43c (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 with mainline.

File:

• kernel/genarch/src/fb/fb.c (modified) (2 diffs)

kernel/genarch/src/fb/fb.c

@@ -49 +49 @@
 #include <bitops.h>
 #include <print.h>
-#include <string.h>
+#include <str.h>
 #include <ddi/ddi.h>
-#include <arch/types.h>
+#include <typedefs.h>
 #include <byteorder.h>
 
@@ -554 +554 @@
         fbdev->data = instance;
         
-        spinlock_initialize(&instance->lock, "*fb_lock");
+        spinlock_initialize(&instance->lock, "*fb.instance.lock");
         instance->rgb_conv = rgb_conv;
         instance->pixelbytes = pixelbytes;