Changeset 8426912a in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2011-01-14T12:35:19Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

d450964

Parents:

6610565b (diff), 08abd81 (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/ia64/src/ia64.c (modified) (1 diff)

kernel/arch/ia64/src/ia64.c

@@ -222 +222 @@
 #endif
 
-        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
 
         sysinfo_set_item_val("ia64_iospace", NULL, true);