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

Timestamp:

2010-05-08T07:53:23Z (14 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

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:

• boot/arch/mips32/include/main.h (moved) (moved from boot/arch/ia64/loader/main.h ) (1 diff)

boot/arch/mips32/include/main.h

@@ -27 +27 @@
  */
 
-#ifndef BOOT_ia64_MAIN_H_
-#define BOOT_ia64_MAIN_H_
+#ifndef BOOT_mips32_MAIN_H_
+#define BOOT_mips32_MAIN_H_
 
-#include <types.h>
-#include <../../../../kernel/arch/ia64/include/bootinfo.h> 
-
-
-#define CONFIG_INIT_TASKS  32
-
-extern void start(void);
 extern void bootstrap(void);