diff options
| author | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2008-02-06 11:04:00 -0500 |
| commit | f315ccb3e679f271583f2a4f463ad9b65665b751 (patch) | |
| tree | 44eb52102587d7b0bb592464cef6ec04bcac8b90 /include/asm-um/linkage.h | |
| parent | ead03e30b050d6dda769e7e9b071c5fa720bf8d2 (diff) | |
| parent | 551e4fb2465b87de9d4aa1669b27d624435443bb (diff) | |
Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'include/asm-um/linkage.h')
| -rw-r--r-- | include/asm-um/linkage.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/asm-um/linkage.h b/include/asm-um/linkage.h index cdb3024a699a..7dfce37adc8b 100644 --- a/include/asm-um/linkage.h +++ b/include/asm-um/linkage.h | |||
| @@ -3,10 +3,4 @@ | |||
| 3 | 3 | ||
| 4 | #include "asm/arch/linkage.h" | 4 | #include "asm/arch/linkage.h" |
| 5 | 5 | ||
| 6 | |||
| 7 | /* <linux/linkage.h> will pick sane defaults */ | ||
| 8 | #ifdef CONFIG_GPROF | ||
| 9 | #undef fastcall | ||
| 10 | #endif | ||
| 11 | |||
| 12 | #endif | 6 | #endif |