diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
| commit | 03fe805a098422d27cbbbad29a54ff1349da3622 (patch) | |
| tree | 0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /arch/sparc/include/asm/kdebug_64.h | |
| parent | 50dd9050e45ce11c575eabcaee8a914caf78fb74 (diff) | |
| parent | 5646eda5851e6cfdfa22d41895e3f5daffa643d3 (diff) | |
Merge branch 'topic/monotonic' into for-next
Diffstat (limited to 'arch/sparc/include/asm/kdebug_64.h')
| -rw-r--r-- | arch/sparc/include/asm/kdebug_64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/include/asm/kdebug_64.h b/arch/sparc/include/asm/kdebug_64.h index feb3578e12c4..04465de8f3b5 100644 --- a/arch/sparc/include/asm/kdebug_64.h +++ b/arch/sparc/include/asm/kdebug_64.h | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | struct pt_regs; | 4 | struct pt_regs; |
| 5 | 5 | ||
| 6 | extern void bad_trap(struct pt_regs *, long); | 6 | void bad_trap(struct pt_regs *, long); |
| 7 | 7 | ||
| 8 | /* Grossly misnamed. */ | 8 | /* Grossly misnamed. */ |
| 9 | enum die_val { | 9 | enum die_val { |