Changeset 6be2c13 in mainline for kernel/genarch/src/drivers/ega/ega.c


Ignore:
Timestamp:
2018-03-16T20:58:20Z (7 years ago)
Author:
GitHub <noreply@…>
Parents:
973be387 (diff), 4b1c7c6f (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.
git-author:
Jiří Zárevúcky <zarevucky.jiri@…> (2018-03-16 20:58:20)
git-committer:
GitHub <noreply@…> (2018-03-16 20:58:20)
Message:

Merge 4b1c7c6ff1e7b982f389a8f841b71af2a85e8cfb into 973be38782462a672111ff6833f8dbb40d2a44bf

File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/genarch/src/drivers/ega/ega.c

    r973be387 r6be2c13  
    601601        instance->base = base;
    602602        instance->addr = (uint8_t *) km_map(addr, EGA_VRAM_SIZE,
    603             PAGE_WRITE | PAGE_NOT_CACHEABLE);
     603            PAGE_WRITE);
    604604        if (!instance->addr) {
    605605                LOG("Unable to EGA video memory.");
Note: See TracChangeset for help on using the changeset viewer.