diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 19:00:26 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-24 19:00:26 -0400 |
| commit | 2f66b529d9d131971e2509aee5478c61ca258ece (patch) | |
| tree | 7a670d9eb76839ed5eecbe0cc1c1c25ba7ba446c /arch/mips/kernel/head.S | |
| parent | 1e66239e23dd0422baf891bf6af0b65ac632b676 (diff) | |
| parent | cdcc9eb5e014a58aba047193a73a0de8b61b988d (diff) | |
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
* 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus:
[MIPS] Fix marge error due to conflict in arch/mips/kernel/head.S
[MIPS] ARC: Remove unused arch/mips/arc/console.c
[MIPS] SNI: sniprom
[MIPS] Jazz: remove unneeded reset functions
[MIPS] Whitespace cleanup.
[MIPS] Make resources for ds1742 "static __initdata"
[MIPS] Replace __attribute_used__ with __used
[MIPS] Jazz: Remove unused arch/mips/jazz/io.c
[MIPS] Mark prom_free_prom_memory as __init_refok
[MIPS] MIPSsim: Fix cflags
Diffstat (limited to 'arch/mips/kernel/head.S')
| -rw-r--r-- | arch/mips/kernel/head.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/kernel/head.S b/arch/mips/kernel/head.S index f78538eceef7..c15bbc436bbd 100644 --- a/arch/mips/kernel/head.S +++ b/arch/mips/kernel/head.S | |||
| @@ -141,7 +141,7 @@ | |||
| 141 | EXPORT(stext) # used for profiling | 141 | EXPORT(stext) # used for profiling |
| 142 | EXPORT(_stext) | 142 | EXPORT(_stext) |
| 143 | 143 | ||
| 144 | #ifdef CONFIG_BOOT_RAW | 144 | #ifndef CONFIG_BOOT_RAW |
| 145 | /* | 145 | /* |
| 146 | * Give us a fighting chance of running if execution beings at the | 146 | * Give us a fighting chance of running if execution beings at the |
| 147 | * kernel load address. This is needed because this platform does | 147 | * kernel load address. This is needed because this platform does |