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

Timestamp:

2012-11-06T21:03:44Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

338810f

Parents:

de73242 (diff), 94795812 (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
 
-/**
- * @}
+/** @}
  */