Changeset ab10b842 in mainline for kernel


Ignore:
Timestamp:
2011-03-22T21:25:00Z (14 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
57d129e, 5f9f37d, 76b5a95c
Parents:
432f68a (diff), c0d77f7 (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 Integrator/CP fixes.

Location:
kernel
Files:
2 deleted
2 edited

Legend:

Unmodified
Added
Removed

  • kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

    r432f68a rab10b842  
    292292                .y = 480,
    293293                .scan = 2560,
    294                 .visual = VISUAL_BGR_0_8_8_8,
     294                .visual = VISUAL_RGB_8_8_8_0,
    295295        };
    296296       

  • kernel/genarch/Makefile.inc

    r432f68a rab10b842  
    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.