Changeset 21b6307 in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2012-10-31T18:26:45Z (13 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

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

Children:

3da166f0

Parents:

6bbe470

Message:

Merge ns16550_output into ns16550_init.

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();