Changeset 04803bf in mainline for boot/arch/mips32/include/main.h


Ignore:
Timestamp:
2011-03-21T22:00:17Z (15 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export
Children:
143932e3
Parents:
b50b5af2 (diff), 7308e84 (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 (needs fixes).

File:
1 moved

Legend:

Unmodified
Added
Removed
  • boot/arch/mips32/include/main.h

    rb50b5af2 r04803bf  
    2727 */
    2828
    29 /** @addtogroup ppc32   
    30  * @{
    31  */
    32 /** @file
    33  */
     29#ifndef BOOT_mips32_MAIN_H_
     30#define BOOT_mips32_MAIN_H_
    3431
    35 #ifndef KERN_ppc32_ARG_H_
    36 #define KERN_ppc32_ARG_H_
    37 
    38 #include <stdarg.h>
     32extern void bootstrap(void);
    3933
    4034#endif
    41 
    42 /** @}
    43  */
Note: See TracChangeset for help on using the changeset viewer.