diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 11:11:13 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-04 11:11:13 -0400 |
| commit | 43d0b1376dc7abc29411fa31f50fe7cfb68afcd3 (patch) | |
| tree | 67dc7b09f7c090a3b1360a6fb06fbf9342047c5c /include/asm-sparc/traps.h | |
| parent | 832f8f0378ff1566f2a222352c7ad5df3f8d0d9d (diff) | |
| parent | fdc657c66678551c7987dc23a78ae1a26251276f (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'include/asm-sparc/traps.h')
| -rw-r--r-- | include/asm-sparc/traps.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asm-sparc/traps.h b/include/asm-sparc/traps.h index 6690ab956ea6..f62c7f878ee1 100644 --- a/include/asm-sparc/traps.h +++ b/include/asm-sparc/traps.h | |||
| @@ -22,7 +22,7 @@ struct tt_entry { | |||
| 22 | /* We set this to _start in system setup. */ | 22 | /* We set this to _start in system setup. */ |
| 23 | extern struct tt_entry *sparc_ttable; | 23 | extern struct tt_entry *sparc_ttable; |
| 24 | 24 | ||
| 25 | extern __inline__ unsigned long get_tbr(void) | 25 | static inline unsigned long get_tbr(void) |
| 26 | { | 26 | { |
| 27 | unsigned long tbr; | 27 | unsigned long tbr; |
| 28 | 28 | ||