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

Timestamp:

2011-05-12T16:49:44Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

f36787d7

Parents:

e80329d6 (diff), 750636a (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

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