Changeset 7a725b13 in mainline for kernel/arch/ia32/src/ia32.c

Timestamp:

2011-01-14T14:23:33Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

b65ca41d

Parents:

f40a1e2 (diff), 2f60e57d (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 usb/development

File:

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

kernel/arch/ia32/src/ia32.c

@@ -196 +196 @@
                 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);
 }