Ignore:
Timestamp:
2011-12-10T08:29:44Z (14 years ago)
Author:
Frantisek Princ <frantisek.princ@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
d9f8dd13
Parents:
b8b1e631 (diff), 87955bfb (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 with mainline

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/amd64/src/boot/multiboot2.S

    rb8b1e631 r30413b31  
    5555                .long MULTIBOOT2_TAG_MODULE
    5656                .long MULTIBOOT2_TAG_MEMMAP
     57#ifdef CONFIG_FB
    5758                .long MULTIBOOT2_TAG_FBINFO
     59#endif
    5860        tag_info_req_end:
    5961       
     
    8587        tag_flags_end:
    8688       
     89#ifdef CONFIG_FB
    8790        /* Framebuffer tag */
    8891        tag_framebuffer_start:
     
    9497                .long CONFIG_BFB_BPP
    9598        tag_framebuffer_end:
     99#endif
    96100       
    97101        /* Module alignment tag */
Note: See TracChangeset for help on using the changeset viewer.