Changeset 89c57b6 in mainline for uspace/srv/hid/kbd/Makefile

Timestamp:

2011-04-13T14:45:41Z (14 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

88634420

Parents:

cefb126 (diff), 17279ead (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/kbd/Makefile (modified) (2 diffs)

uspace/srv/hid/kbd/Makefile

@@ -58 +58 @@
 
 ifeq ($(UARCH),arm32)
+        ifeq ($(MACHINE),gta02)
+                SOURCES += \
+                        port/chardev.c \
+                        ctl/stty.c
+        endif
         ifeq ($(MACHINE),testarm)
                 SOURCES += \
@@ -73 +78 @@
                 SOURCES += \
                         port/pl050.c \
-                        ctl/pl050.c
+                        ctl/pc.c
         endif
 endif