Changeset 8ff0bd2 in mainline for kernel/arch/mips64/include/cache.h


Ignore:
Timestamp:
2011-09-04T11:30:58Z (13 years ago)
Author:
Maurizio Lombardi <m.lombardi85@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
03bc76a
Parents:
d2c67e7 (diff), deac215e (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/cache.h

    rd2c67e7 r8ff0bd2  
    11/*
    2  * Copyright (c) 2009 Jiri Svoboda
     2 * Copyright (c) 2003-2004 Jakub Jermar
    33 * All rights reserved.
    44 *
     
    2727 */
    2828
    29 /** @addtogroup mouse
    30  * @brief
     29/** @addtogroup mips64
    3130 * @{
    3231 */
     
    3433 */
    3534
    36 #ifndef LIBC_IPC_MOUSE_H_
    37 #define LIBC_IPC_MOUSE_H_
     35#ifndef KERN_mips64_CACHE_H_
     36#define KERN_mips64_CACHE_H_
    3837
    39 #include <ipc/common.h>
     38#include <arch/exception.h>
    4039
    41 typedef enum {
    42         MEVENT_BUTTON = IPC_FIRST_USER_METHOD,
    43         MEVENT_MOVE
    44 } mouse_notif_t;
     40extern void cache_error(istate_t *);
    4541
    4642#endif
    4743
    48 /**
    49  * @}
     44/** @}
    5045 */
Note: See TracChangeset for help on using the changeset viewer.