Changeset 8e7c9fe in mainline for kernel/arch/sparc64/src/drivers/niagara.c

Timestamp:

2014-09-12T03:45:25Z (11 years ago)

Author:

Jan Vesely <jano.vesely@…>

Branches:

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

Children:

c53b58e

Parents:

3eb0c85 (diff), 105d8d6 (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

most usb changes were reverted. blink and usbmass were fixed
known problems:
ehci won't initialize
usbmast asserts on unmount (happens on mainline too)

File:

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

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

@@ -63 +63 @@
 static outdev_operations_t niagara_ops = {
         .write = niagara_putchar,
-        .redraw = NULL
+        .redraw = NULL,
+        .scroll_up = NULL,
+        .scroll_down = NULL
 };
 
@@ -206 +208 @@
          */
         
+        sysinfo_set_item_val("fb", NULL, true);
         sysinfo_set_item_val("fb.kind", NULL, 5);