diff options
| author |   Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
|---|---|---|
| committer | Mike Turquette <mturquette@linaro.org> | 2014-02-24 22:21:29 -0800 |
| commit | 10b7cdc0084c27a312e59e80420c6aac70c64753 (patch) | |
| tree | ee891d6236bcd8dc988624839760aaa1846cf906 /arch/powerpc/kernel/vdso32/vdso32_wrapper.S | |
| parent | clk: Correct handling of NULL clk in __clk_{get, put} (diff) | |
| parent | clk: shmobile: Fix typo in MSTP clock DT bindings (diff) | |
| download | linux-dev-10b7cdc0084c27a312e59e80420c6aac70c64753.tar.xz linux-dev-10b7cdc0084c27a312e59e80420c6aac70c64753.zip | |
Merge branch 'clocks/fixes/drivers' of git://linuxtv.org/pinchartl/fbdev into clk-fixes
Diffstat (limited to 'arch/powerpc/kernel/vdso32/vdso32_wrapper.S')
| -rw-r--r-- | arch/powerpc/kernel/vdso32/vdso32_wrapper.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/kernel/vdso32/vdso32_wrapper.S b/arch/powerpc/kernel/vdso32/vdso32_wrapper.S index 79683d0393f5..6ac107ac402a 100644 --- a/arch/powerpc/kernel/vdso32/vdso32_wrapper.S +++ b/arch/powerpc/kernel/vdso32/vdso32_wrapper.S @@ -6,7 +6,7 @@ .globl vdso32_start, vdso32_end .balign PAGE_SIZE vdso32_start: - .incbin "arch/powerpc/kernel/vdso32/vdso32.so" + .incbin "arch/powerpc/kernel/vdso32/vdso32.so.dbg" .balign PAGE_SIZE vdso32_end: |