Changeset 7aaed09 in mainline for kernel/arch/ia32/Makefile.inc


Ignore:
Timestamp:
2011-12-18T14:02:30Z (12 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
c868e2d
Parents:
3b71e84d (diff), 1761268 (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:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/arch/ia32/Makefile.inc

    r3b71e84d r7aaed09  
    107107        arch/$(KARCH)/src/drivers/i8254.c \
    108108        arch/$(KARCH)/src/drivers/i8259.c \
    109         arch/$(KARCH)/src/drivers/vesa.c \
    110         arch/$(KARCH)/src/boot/boot.S \
     109        arch/$(KARCH)/src/boot/multiboot.S \
     110        arch/$(KARCH)/src/boot/multiboot2.S \
    111111        arch/$(KARCH)/src/boot/memmap.c \
    112112        arch/$(KARCH)/src/fpu_context.c \
Note: See TracChangeset for help on using the changeset viewer.