Changeset 89128f3 in mainline for kernel/genarch/src/multiboot/multiboot2.c

Timestamp:

2011-12-08T23:12:14Z (12 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/genarch/src/multiboot/multiboot2.c (modified) (2 diffs)

kernel/genarch/src/multiboot/multiboot2.c

@@ -76 +76 @@
 static void multiboot2_fbinfo(const multiboot2_fbinfo_t *fbinfo)
 {
+#ifdef CONFIG_FB
         if (fbinfo->visual == MULTIBOOT2_VISUAL_RGB) {
                 bfb_addr = fbinfo->addr;
@@ -92 +93 @@
                 bfb_blue_size = fbinfo->rgb.blue_size;
         }
+#endif
 }