Changeset 5828554 in mainline for kernel/genarch/src/drivers/via-cuda/cuda.c

Timestamp:

2014-01-19T14:37:22Z (10 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

cf982ff

Parents:

2f591127 (diff), 476f62c (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/via-cuda/cuda.c (modified) (2 diffs)

kernel/genarch/src/drivers/via-cuda/cuda.c

@@ -118 +118 @@
 }
 
-#include <print.h>
+#include <log.h>
 void cuda_wire(cuda_instance_t *instance, indev_t *kbrdin)
 {
@@ -197 +197 @@
 
         if ((b & TREQ) != 0) {
-                printf("cuda_irq_listen: no TREQ?!\n");
+                log(LF_OTHER, LVL_ERROR, "cuda_irq_listen: no TREQ?!");
                 return;
         }