Changeset 89128f3 in mainline for kernel/arch/amd64/src

Timestamp:

2011-12-08T23:12:14Z (14 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

9c986d3

Parents:

b25199bc (diff), c40f385 (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/amd64/src/boot/multiboot2.S (modified) (3 diffs)

kernel/arch/amd64/src/boot/multiboot2.S

@@ -55 +55 @@
                 .long MULTIBOOT2_TAG_MODULE
                 .long MULTIBOOT2_TAG_MEMMAP
+#ifdef CONFIG_FB
                 .long MULTIBOOT2_TAG_FBINFO
+#endif
         tag_info_req_end:
         
@@ -85 +87 @@
         tag_flags_end:
         
+#ifdef CONFIG_FB
         /* Framebuffer tag */
         tag_framebuffer_start:
@@ -94 +97 @@
                 .long CONFIG_BFB_BPP
         tag_framebuffer_end:
+#endif
         
         /* Module alignment tag */