Changeset ad7a6c9 in mainline for kernel/arch/arm32/src/mach/gta02/gta02.c

Timestamp:

2011-03-30T13:10:24Z (15 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

4ae90f9

Parents:

6e50466 (diff), d6b81941 (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/gta02/gta02.c (modified) (4 diffs)

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

@@ -71 +71 @@
 static void gta02_input_init(void);
 static size_t gta02_get_irq_count(void);
+static const char *gta02_get_platform_name(void);
 
 static void gta02_timer_irq_init(void);
@@ -92 +93 @@
         gta02_output_init,
         gta02_input_init,
-        gta02_get_irq_count
+        gta02_get_irq_count,
+        gta02_get_platform_name
 };
 
@@ -172 +174 @@
                 fb_parea.pbase = GTA02_FB_BASE;
                 fb_parea.frames = 150;
+                fb_parea.unpriv = false;
                 ddi_parea_register(&fb_parea);
         }
@@ -235 +238 @@
 }
 
+const char *gta02_get_platform_name(void)
+{
+        return "gta02";
+}
+
 static void gta02_timer_irq_init(void)
 {