Changeset fe1776c2 in mainline for uspace/srv/hid/kbd/port/z8530.c

Timestamp:

2011-02-11T12:41:11Z (13 years ago)

Author:

Matus Dekanek <smekideki@…>

Branches:

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

Children:

d81ef61c

Parents:

78d1525 (diff), 5d4193c (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 from usb/development

File:

• uspace/srv/hid/kbd/port/z8530.c (modified) (2 diffs)

uspace/srv/hid/kbd/port/z8530.c

@@ -35 +35 @@
  */
 
-#include <ipc/ipc.h>
 #include <ipc/irc.h>
 #include <async.h>
@@ -99 +98 @@
         
         async_set_interrupt_received(z8530_irq_handler);
-        ipc_register_irq(inr, device_assign_devno(), inr, &z8530_kbd);
+        register_irq(inr, device_assign_devno(), inr, &z8530_kbd);
         
         return 0;