Changeset 0b9ac3c in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2010-02-23T19:03:28Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c62d2e1

Parents:

1ccafee (diff), 5e50394 (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) (2 diffs)

kernel/arch/amd64/src/amd64.c

@@ -228 +228 @@
             (uintptr_t) I8042_BASE);
 #endif
+
+#ifdef CONFIG_NETIF_DP8390
+        trap_virtual_enable_irqs(1 << IRQ_DP8390);
+        sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
+#endif
 }
 
@@ -278 +283 @@
 }
 
+void irq_initialize_arch(irq_t *irq)
+{
+        (void) irq;
+}
+
 /** @}
  */