diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:05:05 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-19 16:05:05 -0700 |
| commit | b9719635f85b1d3c54775b53ea45fdd8e7496682 (patch) | |
| tree | dff7ad76a8fe973f46b2b959a28f12d3f47cb3d5 /arch/powerpc/include/asm/elf.h | |
| parent | e72a68fc26887d2097fd7f14794aeb7c17851a5d (diff) | |
| parent | 2d291e902791e1c8d72bc223b6f063bbb27a1280 (diff) | |
Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
* 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc:
Fix compile failure with non modular builds
powerpc: Holly board needs dtbImage target
powerpc: Fix interrupt values for DMA2 in MPC8610 HPCD device tree
Diffstat (limited to 'arch/powerpc/include/asm/elf.h')
| -rw-r--r-- | arch/powerpc/include/asm/elf.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/powerpc/include/asm/elf.h b/arch/powerpc/include/asm/elf.h index 80d1f399ee5..64c6ee22eef 100644 --- a/arch/powerpc/include/asm/elf.h +++ b/arch/powerpc/include/asm/elf.h @@ -409,6 +409,13 @@ do { \ /* Keep this the last entry. */ #define R_PPC64_NUM 107 +/* There's actually a third entry here, but it's unused */ +struct ppc64_opd_entry +{ + unsigned long funcaddr; + unsigned long r2; +}; + #ifdef __KERNEL__ #ifdef CONFIG_SPU_BASE |