Changeset 61ee6df in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2010-02-16T22:16:33Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

7fb2ce3

Parents:

76ecb300 (diff), b20e7c0 (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 the networking branch and necessary fixes.

File:

• kernel/arch/ia64/src/ia64.c (modified) (1 diff)

kernel/arch/ia64/src/ia64.c

@@ -212 +212 @@
             (uintptr_t) I8042_BASE);
 #endif
-        
+
+#ifdef CONFIG_NETIF_DP8390
+        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+#endif
+
         sysinfo_set_item_val("ia64_iospace", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);