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

Timestamp:

2012-02-24T18:04:56Z (12 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

2578199

Parents:

b9bbaad (diff), 087768f (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.

Registering OHCI irq handler panics on ppc32.

File:

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

kernel/arch/ia64/src/ia64.c

@@ -144 +144 @@
 #endif
 #ifdef MACHINE_i460GX
-        platform = "i460GX";
+        platform = "pc";
 #endif
         sysinfo_set_item_data("platform", NULL, (void *) platform,
@@ -187 +187 @@
         sysinfo_set_item_val("kbd.type", NULL, KBD_NS16550);
         sysinfo_set_item_val("kbd.address.physical", NULL,
-            (uintptr_t) NS16550_BASE);
-        sysinfo_set_item_val("kbd.address.kernel", NULL,
             (uintptr_t) NS16550_BASE);
 #endif