diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2006-05-19 01:02:42 -0400 |
| commit | 3c06da5ae5358e9d325d541a053e1059e9654bcc (patch) | |
| tree | 04c953cc82fe57cff248ac523095cd4f0d9611a7 /arch/arm/kernel/head-nommu.S | |
| parent | 4d1f3f25d9c303d1ce63b42cc94c54ac0ab2e950 (diff) | |
| parent | a54c9d30dbb06391ec4422aaf0e1dc2c8c53bd3e (diff) | |
Merge ../linux-2.6
Diffstat (limited to 'arch/arm/kernel/head-nommu.S')
| -rw-r--r-- | arch/arm/kernel/head-nommu.S | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index 0bea65864051..adf62e5eaad7 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S | |||
| @@ -20,12 +20,10 @@ | |||
| 20 | #include <asm/mach-types.h> | 20 | #include <asm/mach-types.h> |
| 21 | #include <asm/procinfo.h> | 21 | #include <asm/procinfo.h> |
| 22 | #include <asm/ptrace.h> | 22 | #include <asm/ptrace.h> |
| 23 | #include <asm/asm-offsets.h> | ||
| 23 | #include <asm/thread_info.h> | 24 | #include <asm/thread_info.h> |
| 24 | #include <asm/system.h> | 25 | #include <asm/system.h> |
| 25 | 26 | ||
| 26 | #define PROCINFO_INITFUNC 12 | ||
| 27 | #define MACHINFO_TYPE 0 | ||
| 28 | |||
| 29 | /* | 27 | /* |
| 30 | * Kernel startup entry point. | 28 | * Kernel startup entry point. |
| 31 | * --------------------------- | 29 | * --------------------------- |