lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' into devel

Browse Source 
Conflicts:
	arch/arm/include/asm/elf.h
	arch/arm/kernel/module.c
This commit is contained in:
Russell King
2009-03-28 20:30:18 +00:00
committed by Russell King
parent ed40d0c472 f0bba9f934
commit 9759d22c83
5 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/include/asm/elf.h
View File

@@ -50,6 +50,7 @@ typedef struct user_fp elf_fpregset_t;
#define R_ARM_ABS32 2
#define R_ARM_CALL 28
#define R_ARM_JUMP24 29
#define R_ARM_V4BX 40
#define R_ARM_PREL31 42
/*