Changeset 89c57b6 in mainline for kernel/arch/arm32/Makefile.inc


Ignore:
Timestamp:
2011-04-13T14:45:41Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
88634420
Parents:
cefb126 (diff), 17279ead (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/arm32/Makefile.inc

    rcefb126 r89c57b6  
    6060        arch/$(KARCH)/src/ras.c
    6161
     62ifeq ($(MACHINE),gta02)
     63        ARCH_SOURCES += arch/$(KARCH)/src/mach/gta02/gta02.c
     64endif
     65
    6266ifeq ($(MACHINE),testarm)
    6367        ARCH_SOURCES += arch/$(KARCH)/src/mach/testarm/testarm.c
Note: See TracChangeset for help on using the changeset viewer.