Changeset 3da166f0 in mainline for kernel/arch/ia64/src

Timestamp:

2014-12-08T19:34:48Z (11 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/ia64/src/ia64.c (modified) (1 diff)

kernel/arch/ia64/src/ia64.c

@@ -173 +173 @@
 #ifdef CONFIG_NS16550
         ns16550_instance_t *ns16550_instance
-            = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL);
+            = ns16550_init((ns16550_t *) NS16550_BASE, NS16550_IRQ, NULL, NULL,
+            NULL);
         if (ns16550_instance) {
                 srln_instance_t *srln_instance = srln_init();