diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/m32r/kernel/head.S | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
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) |