Changeset 00aece0 in mainline for kernel/arch/ia32/Makefile.inc


Ignore:
Timestamp:
2012-02-18T16:47:38Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
4449c6c
Parents:
bd5f3b7 (diff), f943dd3 (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

    rbd5f3b7 r00aece0  
    9999        arch/$(KARCH)/src/userspace.c \
    100100        arch/$(KARCH)/src/cpu/cpu.c \
     101        arch/$(KARCH)/src/mm/km.c \
    101102        arch/$(KARCH)/src/mm/as.c \
    102103        arch/$(KARCH)/src/mm/frame.c \
    … …  
    106107        arch/$(KARCH)/src/drivers/i8254.c \
    107108        arch/$(KARCH)/src/drivers/i8259.c \
    108         arch/$(KARCH)/src/drivers/vesa.c \
    109         arch/$(KARCH)/src/boot/boot.S \
     109        arch/$(KARCH)/src/boot/multiboot.S \
     110        arch/$(KARCH)/src/boot/multiboot2.S \
    110111        arch/$(KARCH)/src/boot/memmap.c \
    111112        arch/$(KARCH)/src/fpu_context.c \
Note: See TracChangeset for help on using the changeset viewer.