Changeset 51e5608 in mainline for kernel/genarch/Makefile.inc


Ignore:
Timestamp:
2011-03-27T17:58:54Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
27bdfa5, 79e1abd, a8ac368, cd1e6b62
Parents:
b330b309 (diff), df81f9ca (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 (0.4.3 Sashimi)

File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/genarch/Makefile.inc

    rb330b309 r51e5608  
    122122endif
    123123
    124 ifeq ($(CONFIG_PL050),y)
    125         GENARCH_SOURCES += \
    126                 genarch/src/kbrd/kbrd_pl050.c \
    127                 genarch/src/kbrd/scanc_pl050.c
    128 endif
    129 
    130124ifeq ($(CONFIG_MAC_KBD),y)
    131125        GENARCH_SOURCES += \
Note: See TracChangeset for help on using the changeset viewer.