Changeset d900699 in mainline for uspace/drv/usbhid/multimedia/multimedia.c

Timestamp:

2011-06-17T16:48:53Z (15 years ago)

Author:

Petr Koupy <petr.koupy@…>

Branches:

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

Children:

f3a605be

Parents:

df8110d3 (diff), 98caf49 (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/drv/usbhid/multimedia/multimedia.c (modified) (2 diffs)

uspace/drv/usbhid/multimedia/multimedia.c

@@ -50 +50 @@
 #include <str_error.h>
 
-#include <ipc/kbd.h>
+#include <ipc/kbdev.h>
 #include <io/console.h>
 
@@ -162 +162 @@
         }
         
-        async_obsolete_msg_4(multim_dev->console_phone, KBD_EVENT, ev.type, ev.key, 
+        async_obsolete_msg_4(multim_dev->console_phone, KBDEV_EVENT, ev.type, ev.key, 
             ev.mods, ev.c);
 }