Changeset 7eaeec1 in mainline for uspace/srv/hid/input/port/niagara.c

Timestamp:

2012-08-20T21:27:38Z (12 years ago)

Author:

Sean Bartell <wingedtachikoma@…>

Branches:

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

Children:

6a97f2e

Parents:

f3a37e28 (diff), dd13349 (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:

• uspace/srv/hid/input/port/niagara.c (modified) (3 diffs)

uspace/srv/hid/input/port/niagara.c

@@ -31 +31 @@
  * @ingroup  kbd
  * @{
- */ 
+ */
 /** @file
- * @brief       Niagara console keyboard port driver.
+ * @brief Niagara console keyboard port driver.
  */
 
@@ -39 +39 @@
 #include <ddi.h>
 #include <async.h>
-#include <kbd.h>
-#include <kbd_port.h>
 #include <sysinfo.h>
 #include <stdio.h>
@@ -46 +44 @@
 #include <bool.h>
 #include <errno.h>
+#include "../kbd_port.h"
+#include "../kbd.h"
 
 static int niagara_port_init(kbd_dev_t *);