Changeset 15d0046 in mainline for kernel/genarch/Makefile.inc


Ignore:
Timestamp:
2014-09-12T13:22:33Z (10 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
9b20126
Parents:
8db09e4 (diff), 105d8d6 (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/genarch/Makefile.inc

    r8db09e4 r15d0046  
    181181                genarch/src/drivers/ega/ega.c
    182182endif
     183
     184ifeq ($(CONFIG_IOMAP_BITMAP), y)
     185        GENARCH_SOURCES += \
     186                genarch/src/ddi/ddi-bitmap.c
     187endif
     188
     189ifeq ($(CONFIG_IOMAP_DUMMY), y)
     190        GENARCH_SOURCES += \
     191                genarch/src/ddi/ddi-dummy.c
     192endif
     193
Note: See TracChangeset for help on using the changeset viewer.