Changeset 3da166f0 in mainline for kernel/arch/sparc64/src/drivers/kbd.c

Timestamp:

2014-12-08T19:34:48Z (9 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f42adef

Parents:

7785ebd7 (diff), 21b6307 (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 from lp:~martin-sucha/helenos/kernel-serial

File:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (1 diff)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -122 +122 @@
         
         ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, inr, cir,
-            cir_arg);
+            cir_arg, NULL);
         if (ns16550_instance) {
                 kbrd_instance_t *kbrd_instance = kbrd_init();