Index: kernel/arch/amd64/src/boot/multiboot2.S
===================================================================
--- kernel/arch/amd64/src/boot/multiboot2.S	(revision 1f5c9c96476a03a43ef971cbc095c9553338eaf6)
+++ kernel/arch/amd64/src/boot/multiboot2.S	(revision 38650da4073b3c28c1a257d2056b62e8a09de8f6)
@@ -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 1f5c9c96476a03a43ef971cbc095c9553338eaf6)
+++ kernel/arch/ia32/src/boot/multiboot2.S	(revision 38650da4073b3c28c1a257d2056b62e8a09de8f6)
@@ -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 */