Changeset 92574f4 in mainline for kernel/arch/sparc64/src/drivers/niagara.c

Timestamp:

2011-02-24T12:03:27Z (13 years ago)

Author:

Lubos Slovak <lubos.slovak@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

e7b7ebd5

Parents:

4837092 (diff), a80849c (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:

Merged development (changes in DDF, etc.).

Conflicts in uspace/drv/usbkbd/main.c

File:

• kernel/arch/sparc64/src/drivers/niagara.c (modified) (2 diffs)

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

@@ -216 +216 @@
         outbuf_parea.pbase = (uintptr_t) (KA2PA(&output_buffer));
         outbuf_parea.frames = 1;
+        outbuf_parea.unpriv = false;
         ddi_parea_register(&outbuf_parea);
 
@@ -221 +222 @@
         inbuf_parea.pbase = (uintptr_t) (KA2PA(&input_buffer));
         inbuf_parea.frames = 1;
+        inbuf_parea.unpriv = false;
         ddi_parea_register(&inbuf_parea);