Fork us on GitHub Follow us on Facebook Follow us on Twitter

Ignore:
Timestamp:
2011-08-16T18:53:00Z (10 years ago)
Author:
Petr Koupy <petr.koupy@…>
Branches:
lfn, master
Children:
49160c4
Parents:
e0e922d (diff), 45058baa (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:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/drv/bus/usb/usbhid/kbd/kbddev.c

    re0e922d rdb6e419  
    7272
    7373// FIXME: remove this header
    74 #include <kernel/ipc/ipc_methods.h>
     74#include <abi/ipc/methods.h>
    7575
    7676/*----------------------------------------------------------------------------*/
     
    524524        assert(kbd_dev != NULL);
    525525       
    526         /* Create the function exposed under /dev/devices. */
     526        /* Create the exposed function. */
    527527        usb_log_debug("Creating DDF function %s...\n", HID_KBD_FUN_NAME);
    528528        ddf_fun_t *fun = ddf_fun_create(hid_dev->usb_dev->ddf_dev, fun_exposed,
Note: See TracChangeset for help on using the changeset viewer.