Changeset 8b655705 in mainline for kernel/arch/arm32/src/mach/integratorcp/integratorcp.c

Timestamp:

2011-04-15T19:38:07Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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 mainline changes.

File:

• kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (modified) (2 diffs)

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

@@ -292 +292 @@
                 .y = 480,
                 .scan = 2560,
-                .visual = VISUAL_BGR_0_8_8_8,
+                .visual = VISUAL_RGB_8_8_8_0,
         };
         
@@ -300 +300 @@
                 fb_parea.pbase = ICP_FB;
                 fb_parea.frames = 300;
+                fb_parea.unpriv = false;
                 ddi_parea_register(&fb_parea);
         }