Ignore:
Timestamp:
2011-09-19T16:31:00Z (13 years ago)
Author:
Vojtech Horky <vojtechhorky@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
a347a11
Parents:
3842a955 (diff), 086290d (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
  • kernel/arch/mips64/include/proc/task.h

    r3842a955 r26e7d6d  
    11/*
    2  * Copyright (c) 2010 Jiri Svoboda
     2 * Copyright (c) 2006 Jakub Jermar
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup mouse
    30  * @brief
     29/** @addtogroup mips64proc
    3130 * @{
    3231 */
     
    3433 */
    3534
    36 #ifndef ADB_MOUSE_H_
    37 #define ADB_MOUSE_H_
     35#ifndef KERN_mips64_TASK_H_
     36#define KERN_mips64_TASK_H_
    3837
    39 #include <sys/types.h>
     38typedef struct {
     39} task_arch_t;
    4040
    41 #define NAME       "adb_ms"
    42 #define NAMESPACE  "hid_in"
    43 
    44 extern void mouse_handle_data(uint16_t);
     41#define task_create_arch(task)
     42#define task_destroy_arch(task)
    4543
    4644#endif
    4745
    48 /**
    49  * @}
     46/** @}
    5047 */
Note: See TracChangeset for help on using the changeset viewer.