Changeset f8e1a2c in mainline for uspace/lib/usb/include


Ignore:
Timestamp:
2011-03-21T13:19:19Z (14 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
0e45e7f, 8a951ca
Parents:
e387d0f (diff), 2e1d5d70 (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 development/ changes

Location:
uspace/lib/usb/include/usb/host
Files:
1 added
1 moved

Legend:

Unmodified
Added
Removed

  • uspace/lib/usb/include/usb/host/device_keeper.h

    re387d0f rf8e1a2c  
    2727 */
    2828
    29 /** @addtogroup drvusbuhcihc
     29/** @addtogroup libusb
    3030 * @{
    3131 */
    … …  
    3333 * @brief UHCI driver
    3434 */
    35 #ifndef UTILS_DEVICE_KEEPER_H
    36 #define UTILS_DEVICE_KEEPER_H
     35#ifndef LIBUSB_HOST_DEVICE_KEEPER_H
     36#define LIBUSB_HOST_DEVICE_KEEPER_H
    3737#include <devman.h>
    3838#include <fibril_synch.h>
Note: See TracChangeset for help on using the changeset viewer.