Changeset 4c53333 in mainline for uspace/srv/hid/input/kbd_ctl.h

Timestamp:

2013-07-11T08:21:10Z (12 years ago)

Author:

Maurizio Lombardi <m.lombardi85@…>

Branches:

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

Children:

64e63ce1

Parents:

80445cf (diff), c8bb1633 (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/kbd_ctl.h (moved) (moved from uspace/srv/hid/input/include/kbd_ctl.h ) (2 diffs)

uspace/srv/hid/input/kbd_ctl.h

@@ -38 +38 @@
 #define KBD_CTL_H_
 
-#include <kbd_port.h>
+#include "kbd_port.h"
 
 struct kbd_dev;
@@ -49 +49 @@
 
 extern kbd_ctl_ops_t apple_ctl;
-extern kbd_ctl_ops_t gxe_fb_ctl;
 extern kbd_ctl_ops_t kbdev_ctl;
 extern kbd_ctl_ops_t pc_ctl;