Fork us on GitHub Follow us on Facebook Follow us on Twitter

Changeset 25a76ab8 in mainline for boot/arch/mips32/include/main.h


Ignore:
Timestamp:
2010-05-08T07:53:23Z (12 years ago)
Author:
Jiri Svoboda <jiri@…>
Branches:
lfn, master
Children:
051bc69a
Parents:
6c39a907 (diff), 1317380 (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
  • boot/arch/mips32/include/main.h

    r6c39a907 r25a76ab8  
    2727 */
    2828
    29 #ifndef BOOT_ia64_MAIN_H_
    30 #define BOOT_ia64_MAIN_H_
     29#ifndef BOOT_mips32_MAIN_H_
     30#define BOOT_mips32_MAIN_H_
    3131
    32 #include <types.h>
    33 #include <../../../../kernel/arch/ia64/include/bootinfo.h>
    34 
    35 
    36 #define CONFIG_INIT_TASKS  32
    37 
    38 extern void start(void);
    3932extern void bootstrap(void);
    4033
Note: See TracChangeset for help on using the changeset viewer.