Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6

[linux-2.6] / arch / ppc64 / kernel / vdso32 / vdso32.lds.S

diff --git a/arch/ppc64/kernel/vdso32/vdso32.lds.S b/arch/ppc64/kernel/vdso32/vdso32.lds.S
index 11290c902ba324ff61688052257e368e061d7a57..6f87a916a394c37f7d63564f8d62edcd7569cc80 100644 (file)
--- a/arch/ppc64/kernel/vdso32/vdso32.lds.S
+++ b/arch/ppc64/kernel/vdso32/vdso32.lds.S
@@ -40,9 +40,9 @@ SECTIONS
   .gcc_except_table    : { *(.gcc_except_table) }
   .fixup               : { *(.fixup) }
 
-  .got ALIGN(4)                : { *(.got.plt) *(.got) }
-
   .dynamic             : { *(.dynamic) }               :text   :dynamic
+  .got : { *(.got) }
+  .plt : { *(.plt) }
 
   _end = .;
   __end = .;