diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-12 09:22:27 +0200 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2013-09-12 09:22:27 +0200 |
| commit | 2ac80fc07a1479389f3d1a71fa6a230dd1153b63 (patch) | |
| tree | 071dd7595411caa58e9214e3a811ec304b1d707e /drivers/watchdog | |
| parent | 7953083a0bc0b7e4887630e1330db88f42674836 (diff) | |
| parent | d5d04bb48f0eb89c14e76779bb46212494de0bec (diff) | |
| download | kernel_goldelico_gta04-2ac80fc07a1479389f3d1a71fa6a230dd1153b63.zip kernel_goldelico_gta04-2ac80fc07a1479389f3d1a71fa6a230dd1153b63.tar.gz kernel_goldelico_gta04-2ac80fc07a1479389f3d1a71fa6a230dd1153b63.tar.bz2 | |
fixed merge conflicts
Signed-off-by: H. Nikolaus Schaller <hns@goldelico.com>
Diffstat (limited to 'drivers/watchdog')
| -rw-r--r-- | drivers/watchdog/hpwdt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/watchdog/hpwdt.c b/drivers/watchdog/hpwdt.c index de7e4f4..5be5e3d 100644 --- a/drivers/watchdog/hpwdt.c +++ b/drivers/watchdog/hpwdt.c @@ -162,7 +162,8 @@ extern asmlinkage void asminline_call(struct cmn_registers *pi86Regs, #define HPWDT_ARCH 32 asm(".text \n\t" - ".align 4 \n" + ".align 4 \n\t" + ".globl asminline_call \n" "asminline_call: \n\t" "pushl %ebp \n\t" "movl %esp, %ebp \n\t" @@ -352,7 +353,8 @@ static int detect_cru_service(void) #define HPWDT_ARCH 64 asm(".text \n\t" - ".align 4 \n" + ".align 4 \n\t" + ".globl asminline_call \n" "asminline_call: \n\t" "pushq %rbp \n\t" "movq %rsp, %rbp \n\t" |