Changeset 12d7710 in mainline for kernel/arch/ia64/include/bootinfo.h

Timestamp:

2010-03-26T22:01:28Z (15 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1faa995

Parents:

4204ad9 (diff), eaf22d4 (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/include/bootinfo.h (modified) (1 diff)

kernel/arch/ia64/include/bootinfo.h

@@ -67 +67 @@
         unsigned int memmap_items;
 
-        unsigned long * sapic;
+        unative_t *sapic;
         unsigned long sys_freq;
         unsigned long freq_scale;