Changeset c621f4aa in mainline for kernel/genarch/src/kbrd/kbrd_pl050.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/kbrd/kbrd_pl050.c (modified) (1 diff)

kernel/genarch/src/kbrd/kbrd_pl050.c

@@ -181 +181 @@
                 indev_initialize("kbrd", &instance->raw, &kbrd_raw_ops);
                 
-                spinlock_initialize(&instance->keylock, "instance_keylock");
+                spinlock_initialize(&instance->keylock, "kbrd_pl050.instance.keylock");
                 instance->keyflags = 0;
                 instance->lockflags = 0;