Changeset 6843a9c in mainline for kernel/genarch/Makefile.inc


Ignore:
Timestamp:
2012-06-29T13:02: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:
722912e
Parents:
ba72f2b (diff), 0bbd13e (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

Trivial conflicts.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/genarch/Makefile.inc

    rba72f2b r6843a9c  
    6767                genarch/src/fb/font-8x16.c \
    6868                genarch/src/fb/logo-196x66.c \
    69                 genarch/src/fb/fb.c
     69                genarch/src/fb/fb.c \
     70                genarch/src/fb/bfb.c
    7071endif
    7172
    … …  
    143144ifeq ($(CONFIG_MULTIBOOT), y)
    144145        GENARCH_SOURCES += \
    145                 genarch/src/multiboot/multiboot.c
     146                genarch/src/multiboot/multiboot.c \
     147                genarch/src/multiboot/multiboot2.c
    146148endif
    147149
Note: See TracChangeset for help on using the changeset viewer.