diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-10-30 21:37:12 -0500 |
| commit | 23fd07750a789a66fe88cf173d52a18f1a387da4 (patch) | |
| tree | 06fdd6df35fdb835abdaa9b754d62f6b84b97250 /include/asm-um/linkage.h | |
| parent | bd787d438a59266af3c9f6351644c85ef1dd21fe (diff) | |
| parent | ed28f96ac1960f30f818374d65be71d2fdf811b0 (diff) | |
Merge ../linux-2.6 by hand
Diffstat (limited to 'include/asm-um/linkage.h')
| -rw-r--r-- | include/asm-um/linkage.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/asm-um/linkage.h b/include/asm-um/linkage.h index 7dfce37adc8b..e3d62dcbd356 100644 --- a/include/asm-um/linkage.h +++ b/include/asm-um/linkage.h | |||
| @@ -3,4 +3,12 @@ | |||
| 3 | 3 | ||
| 4 | #include "asm/arch/linkage.h" | 4 | #include "asm/arch/linkage.h" |
| 5 | 5 | ||
| 6 | #include <linux/config.h> | ||
| 7 | |||
| 8 | /* <linux/linkage.h> will pick sane defaults */ | ||
| 9 | #ifdef CONFIG_GPROF | ||
| 10 | #undef FASTCALL | ||
| 11 | #undef fastcall | ||
| 12 | #endif | ||
| 13 | |||
| 6 | #endif | 14 | #endif |