diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-02 16:41:36 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-02 16:41:36 -0500 |
| commit | 923a789b49c7269a0245d5af6afe486188d940df (patch) | |
| tree | c3f168427372e64f7467a794f313416da5086ba0 /include/linux/compiler-gcc3.h | |
| parent | 103ceffb9501531f6931df6aebc11a05189201f0 (diff) | |
| parent | b840d79631c882786925303c2b0f4fefc31845ed (diff) | |
Merge branch 'linus' into x86/cleanups
Conflicts:
arch/x86/kernel/reboot.c
Diffstat (limited to 'include/linux/compiler-gcc3.h')
| -rw-r--r-- | include/linux/compiler-gcc3.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/linux/compiler-gcc3.h b/include/linux/compiler-gcc3.h index e5eb795f78a1..2befe6513ce4 100644 --- a/include/linux/compiler-gcc3.h +++ b/include/linux/compiler-gcc3.h | |||
| @@ -2,9 +2,6 @@ | |||
| 2 | #error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead." | 2 | #error "Please don't include <linux/compiler-gcc3.h> directly, include <linux/compiler.h> instead." |
| 3 | #endif | 3 | #endif |
| 4 | 4 | ||
| 5 | /* These definitions are for GCC v3.x. */ | ||
| 6 | #include <linux/compiler-gcc.h> | ||
| 7 | |||
| 8 | #if __GNUC_MINOR__ >= 3 | 5 | #if __GNUC_MINOR__ >= 3 |
| 9 | # define __used __attribute__((__used__)) | 6 | # define __used __attribute__((__used__)) |
| 10 | #else | 7 | #else |