Changeset 92574f4 in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

Timestamp:

2011-02-24T12:03:27Z (14 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/arm32/src/mach/integratorcp/integratorcp.c (modified) (1 diff)

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

@@ -300 +300 @@
                 fb_parea.pbase = ICP_FB;
                 fb_parea.frames = 300;
+                fb_parea.unpriv = false;
                 ddi_parea_register(&fb_parea);
         }