diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 11:30:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-29 11:30:47 -0400 |
| commit | df45eddc60e1ab4c81b61e240271eabb4fb176e8 (patch) | |
| tree | 7cbaf1a7a191f7b6274afbc071bbc1453f73d668 /arch/m32r/kernel/head.S | |
| parent | 929675d58c5b4883050804f2b48de2293803862d (diff) | |
| parent | 81e4807303c416a0defdce8b23a6204416d33280 (diff) | |
Merge branch 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev
* 'linux-m32r' of git://www.linux-m32r.org/git/takata/linux-2.6_dev:
m32r/kernel/: cleanups
m32r: export __ndelay
m32r: export empty_zero_page
m32r: don't offer CONFIG_ISA
m32r: remove the unused NOHIGHMEM option
Diffstat (limited to 'arch/m32r/kernel/head.S')
| -rw-r--r-- | arch/m32r/kernel/head.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/m32r/kernel/head.S b/arch/m32r/kernel/head.S index dab7436d7bbe..40180778a5c7 100644 --- a/arch/m32r/kernel/head.S +++ b/arch/m32r/kernel/head.S | |||
| @@ -29,7 +29,6 @@ __INITDATA | |||
| 29 | .global _end | 29 | .global _end |
| 30 | ENTRY(stext) | 30 | ENTRY(stext) |
| 31 | ENTRY(_stext) | 31 | ENTRY(_stext) |
| 32 | ENTRY(startup_32) | ||
| 33 | /* Setup up the stack pointer */ | 32 | /* Setup up the stack pointer */ |
| 34 | LDIMM (r0, spi_stack_top) | 33 | LDIMM (r0, spi_stack_top) |
| 35 | LDIMM (r1, spu_stack_top) | 34 | LDIMM (r1, spu_stack_top) |