Changeset 6be2c13 in mainline for kernel/arch/sparc64/src/drivers/kbd.c

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:

• kernel/arch/sparc64/src/drivers/kbd.c (modified) (1 diff)

kernel/arch/sparc64/src/drivers/kbd.c

@@ -119 +119 @@
 
         ioport8_t *ns16550 = (ioport8_t *) (km_map(aligned_addr, offset + size,
-            PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset);
+            PAGE_WRITE) + offset);
 
         ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, 0, inr, cir,