Changeset bc73be3 in mainline for kernel/genarch/include/genarch/drivers/pl011/pl011.h

Timestamp:

2019-06-27T08:51:20Z (7 years ago)

Author:

Jaroslav Jindrak <dzejrou@…>

Branches:

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

Children:

8add15e0

Parents:

ad40b74b (diff), aeba767 (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:

cpp: merge and resolve conflicts

File:

• kernel/genarch/include/genarch/drivers/pl011/pl011.h (modified) (2 diffs)

kernel/genarch/include/genarch/drivers/pl011/pl011.h

@@ -38 +38 @@
 #define KERN_PL011_H_
 
+#include <ddi/ddi.h>
 #include <ddi/irq.h>
 #include <console/chardev.h>
@@ -150 +151 @@
         outdev_t outdev;
         irq_t irq;
+        parea_t parea;
 } pl011_uart_t;