Changeset 39aa8ce in mainline for kernel/arch/arm32/src/mach/testarm/testarm.c

Timestamp:

2012-02-16T22:16:18Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

4d433fe

Parents:

9744f2d (diff), c01bb5f9 (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/arm32/src/mach/testarm/testarm.c (modified) (1 diff)

kernel/arch/arm32/src/mach/testarm/testarm.c

@@ -128 +128 @@
         sysinfo_set_item_val("kbd", NULL, true);
         sysinfo_set_item_val("kbd.inr", NULL, GXEMUL_KBD_IRQ);
-        sysinfo_set_item_val("kbd.address.virtual", NULL, (sysarg_t) gxemul_kbd);
+        sysinfo_set_item_val("kbd.address.physical", NULL,
+            GXEMUL_KBD_ADDRESS);
 #endif
 }