diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:00:54 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 16:00:54 -0400 |
| commit | bb2c018b09b681d43f5e08124b83e362647ea82b (patch) | |
| tree | d794902c78f9fdd04ed88a4b8d451ed6f9292ec0 /arch/powerpc/boot/zImage.coff.lds.S | |
| parent | 82638844d9a8581bbf33201cc209a14876eca167 (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into cpus4096
Conflicts:
drivers/acpi/processor_throttling.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/powerpc/boot/zImage.coff.lds.S')
| -rw-r--r-- | arch/powerpc/boot/zImage.coff.lds.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/powerpc/boot/zImage.coff.lds.S b/arch/powerpc/boot/zImage.coff.lds.S index fe87a90ce7f1..856dc78b14ef 100644 --- a/arch/powerpc/boot/zImage.coff.lds.S +++ b/arch/powerpc/boot/zImage.coff.lds.S | |||
| @@ -3,7 +3,6 @@ ENTRY(_zimage_start_opd) | |||
| 3 | EXTERN(_zimage_start_opd) | 3 | EXTERN(_zimage_start_opd) |
| 4 | SECTIONS | 4 | SECTIONS |
| 5 | { | 5 | { |
| 6 | . = (5*1024*1024); | ||
| 7 | _start = .; | 6 | _start = .; |
| 8 | .text : | 7 | .text : |
| 9 | { | 8 | { |