Index: kernel/arch/amd64/src/boot/multiboot2.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot2.S	(revision 1adbf90f3bd29c94bcf7f7fcc5d3af378d882064)
+++ kernel/arch/amd64/src/boot/multiboot2.S	(revision 40898df9bd87e62304262ae87135522a4eb7895a)
@@ -55,5 +55,7 @@
 		.long MULTIBOOT2_TAG_MODULE
 		.long MULTIBOOT2_TAG_MEMMAP
+#ifdef CONFIG_FB
 		.long MULTIBOOT2_TAG_FBINFO
+#endif
 	tag_info_req_end:
 	
@@ -85,4 +87,5 @@
 	tag_flags_end:
 	
+#ifdef CONFIG_FB
 	/* Framebuffer tag */
 	tag_framebuffer_start:
@@ -94,4 +97,5 @@
 		.long CONFIG_BFB_BPP
 	tag_framebuffer_end:
+#endif
 	
 	/* Module alignment tag */
Index: kernel/arch/ia32/src/boot/multiboot2.S
===================================================================
--- kernel/arch/ia32/src/boot/multiboot2.S	(revision 1adbf90f3bd29c94bcf7f7fcc5d3af378d882064)
+++ kernel/arch/ia32/src/boot/multiboot2.S	(revision 40898df9bd87e62304262ae87135522a4eb7895a)
@@ -53,5 +53,7 @@
 		.long MULTIBOOT2_TAG_MODULE
 		.long MULTIBOOT2_TAG_MEMMAP
+#ifdef CONFIG_FB
 		.long MULTIBOOT2_TAG_FBINFO
+#endif
 	tag_info_req_end:
 	
@@ -83,4 +85,5 @@
 	tag_flags_end:
 	
+#ifdef CONFIG_FB
 	/* Framebuffer tag */
 	tag_framebuffer_start:
@@ -92,4 +95,5 @@
 		.long CONFIG_BFB_BPP
 	tag_framebuffer_end:
+#endif
 	
 	/* Module alignment tag */
Index: kernel/genarch/src/multiboot/multiboot2.c
===================================================================
--- kernel/genarch/src/multiboot/multiboot2.c	(revision 1adbf90f3bd29c94bcf7f7fcc5d3af378d882064)
+++ kernel/genarch/src/multiboot/multiboot2.c	(revision 40898df9bd87e62304262ae87135522a4eb7895a)
@@ -76,4 +76,5 @@
 static void multiboot2_fbinfo(const multiboot2_fbinfo_t *fbinfo)
 {
+#ifdef CONFIG_FB
 	if (fbinfo->visual == MULTIBOOT2_VISUAL_RGB) {
 		bfb_addr = fbinfo->addr;
@@ -92,4 +93,5 @@
 		bfb_blue_size = fbinfo->rgb.blue_size;
 	}
+#endif
 }