Changeset 948911d in mainline for kernel/arch/ia64/src/ia64.c

Timestamp:

2012-01-24T02:27:43Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

230385c

Parents:

8afeb04 (diff), 2df6f6fe (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:

Mainline changes.

File:

• kernel/arch/ia64/src/ia64.c (modified) (2 diffs)

kernel/arch/ia64/src/ia64.c

@@ -188 +188 @@
         
 #ifdef CONFIG_I8042
-        i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE, IRQ_KBD);
+        i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE,
+            IRQ_KBD);
         if (i8042_instance) {
                 kbrd_instance_t *kbrd_instance = kbrd_init();
@@ -197 +198 @@
                 }
         }
-        
-        sysinfo_set_item_val("i8042", NULL, true);
-        sysinfo_set_item_val("i8042.inr_a", NULL, IRQ_KBD);
-        sysinfo_set_item_val("i8042.inr_b", NULL, IRQ_MOUSE);
-        sysinfo_set_item_val("i8042.address.physical", NULL,
-            (uintptr_t) I8042_BASE);
-        sysinfo_set_item_val("i8042.address.kernel", NULL,
-            (uintptr_t) I8042_BASE);
-#endif
-
-        sysinfo_set_item_val("netif.ne2000.inr", NULL, IRQ_NE2000);
-
+#endif
+        
         sysinfo_set_item_val("ia64_iospace", NULL, true);
         sysinfo_set_item_val("ia64_iospace.address", NULL, true);