Changeset 7eaeec1 in mainline for uspace/srv/hid/output/port/niagara.h

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/output/port/niagara.h (moved) (moved from uspace/srv/hid/fb/port/niagara.h ) (2 diffs)

uspace/srv/hid/output/port/niagara.h

@@ -30 +30 @@
  */
 
-#ifndef FB_PORT_NIAGARA_H_
-#define FB_PORT_NIAGARA_H_
+#ifndef OUTPUT_PORT_NIAGARA_H_
+#define OUTPUT_PORT_NIAGARA_H_
 
 extern int niagara_init(void);
@@ -37 +37 @@
 #endif
 
-/**
- * @}
+/** @}
  */