Changeset 26e7d6d in mainline for uspace/srv/hid/input/Makefile

Timestamp:

2011-09-19T16:31:00Z (13 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

a347a11

Parents:

3842a955 (diff), 086290d (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/Makefile (modified) (3 diffs)

uspace/srv/hid/input/Makefile

@@ -36 +36 @@
         generic/input.c \
         generic/layout.c \
-        generic/mouse.c \
         generic/stroke.c \
         layout/cz.c \
@@ -42 +41 @@
         layout/us_dvorak.c \
         port/adb.c \
+        port/adb_mouse.c \
         port/chardev.c \
+        port/chardev_mouse.c \
         port/gxemul.c \
         port/msim.c \
@@ -48 +49 @@
         port/ns16550.c \
         port/pl050.c \
-        port/sgcn.c \
         port/ski.c \
-        port/z8530.c \
+        proto/adb.c \
+        proto/mousedev.c \
+        proto/ps2.c \
         ctl/apple.c \
         ctl/gxe_fb.c \