Changeset 7943c43 in mainline for uspace/srv/hid/input/port/msim.c

Timestamp:

2012-01-16T22:45:38Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

32817cc, 3fe58d3c

Parents:

9117ef9b (diff), 3ea725e (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/port/msim.c (modified) (1 diff)

uspace/srv/hid/input/port/msim.c

@@ -89 +89 @@
         msim_cmds[0].addr = (void *) vaddr;
         async_set_interrupt_received(msim_irq_handler);
-        register_irq(inr, device_assign_devno(), 0, &msim_kbd);
+        irq_register(inr, device_assign_devno(), 0, &msim_kbd);
         
         return 0;