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/mouse/mousedev.c

    re0e922d rdb6e419  
    5757
    5858// FIXME: remove this header
    59 #include <kernel/ipc/ipc_methods.h>
     59#include <abi/ipc/methods.h>
    6060
    6161#define NAME "mouse"
     
    325325        assert(mouse != NULL);
    326326       
    327         /* Create the function exposed under /dev/devices. */
     327        /* Create the exposed function. */
    328328        usb_log_debug("Creating DDF function %s...\n", HID_MOUSE_FUN_NAME);
    329329        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.