Changeset ea28272 in mainline for uspace/app/tester/tester.c

Timestamp:

2010-12-30T13:43:27Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d770deb

Parents:

d70d80ed (diff), f418e51 (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/app/tester/tester.c (modified) (1 diff)

uspace/app/tester/tester.c

@@ -60 +60 @@
 #include "vfs/vfs1.def"
 #include "ipc/ping_pong.def"
-#include "ipc/register.def"
-#include "ipc/connect.def"
 #include "loop/loop1.def"
 #include "mm/malloc1.def"
 #include "hw/serial/serial1.def"
+#include "hw/misc/virtchar1.def"
         {NULL, NULL, NULL, false}
 };