Changeset 8b5690f in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2011-02-03T05:11:01Z (13 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

ba38f72c

Parents:

22027b6e (diff), 86d7bfa (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 mainline changes.

File:

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

kernel/arch/amd64/src/amd64.c

@@ -238 +238 @@
                 sysinfo_set_item_val(irqs_info, NULL, true);
         
-        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
 }