Ignore:
Timestamp:
2011-07-20T15:26:21Z (13 years ago)
Author:
Jakub Jermar <jakub@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
efcebe1
Parents:
25bef0ff (diff), a701812 (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 moved

Legend:

Unmodified
Added
Removed
  • uspace/lib/c/arch/mips64/include/istate.h

    r25bef0ff r6a44ee4  
    2727 */
    2828
    29 /** @addtogroup mouse
    30  * @brief
     29/** @addtogroup libcmips64
    3130 * @{
    3231 */
     
    3433 */
    3534
    36 #ifndef ADBDEV_H_
    37 #define ADBDEV_H_
     35#ifndef LIBC_mips64__ISTATE_H_
     36#define LIBC_mips64__ISTATE_H_
    3837
    39 #include <sys/types.h>
    40 
    41 extern int adb_dev_init(void);
     38#include <arch/istate.h>
    4239
    4340#endif
    4441
    45 /**
    46  * @}
    47  */
    48 
     42/** @}
     43 */
Note: See TracChangeset for help on using the changeset viewer.