Changeset 8b863a62 in mainline for kernel/genarch/src/drivers/s3c24xx/uart.c

Timestamp:

2014-04-16T17:14:06Z (11 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

f857e8b

Parents:

dba3e2c (diff), 70b570c (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/genarch/src/drivers/s3c24xx/uart.c (moved) (moved from kernel/genarch/src/drivers/s3c24xx_uart/s3c24xx_uart.c ) (2 diffs)

kernel/genarch/src/drivers/s3c24xx/uart.c

@@ -38 +38 @@
  */
 
-#include <genarch/drivers/s3c24xx_uart/s3c24xx_uart.h>
+#include <genarch/drivers/s3c24xx/uart.h>
 #include <console/chardev.h>
 #include <console/console.h>
@@ -95 +95 @@
 static outdev_operations_t s3c24xx_uart_ops = {
         .write = s3c24xx_uart_putchar,
-        .redraw = NULL
+        .redraw = NULL,
+        .scroll_up = NULL,
+        .scroll_down = NULL
 };