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

Timestamp:

2010-02-23T19:03:28Z (14 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/ia64/src/ia64.c (modified) (3 diffs)

kernel/arch/ia64/src/ia64.c

@@ -44 +44 @@
 #include <arch/stack.h>
 #include <arch/mm/page.h>
+#include <interrupt.h>
 #include <mm/as.h>
 #include <config.h>
@@ -211 +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);
@@ -280 +285 @@
 }
 
+void irq_initialize_arch(irq_t *irq)
+{
+        (void) irq;
+}
+
 /** @}
  */