Changeset 3aae4e8 in mainline for kernel/arch/amd64/src/amd64.c

Timestamp:

2010-04-04T22:07:05Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

23de644

Parents:

9f10660f (diff), 73060801 (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

@@ -228 +228 @@
             (uintptr_t) I8042_BASE);
 #endif
-
-#ifdef CONFIG_NETIF_DP8390
+        
+        /*
+         * This nasty hack should also go away ASAP.
+         */
         trap_virtual_enable_irqs(1 << IRQ_DP8390);
         sysinfo_set_item_val("netif.dp8390.inr", NULL, IRQ_DP8390);
-#endif
 }