Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git

Signed-off-by: Steve French <sfrench@us.ibm.com>

1 files changed, 0 insertions, 7 deletions

diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h
index 53686c037a06..e913e9beaf69 100644
--- a/include/linux/compiler-gcc4.h
+++ b/include/linux/compiler-gcc4.h
@@ -3,14 +3,7 @@
 /* These definitions are for GCC v4.x.  */
 #include <linux/compiler-gcc.h>
 
-#define inline                  inline          __attribute__((always_inline))
-#define __inline__              __inline__      __attribute__((always_inline))
-#define __inline                __inline        __attribute__((always_inline))
-#define __deprecated            __attribute__((deprecated))
 #define __attribute_used__      __attribute__((__used__))
-#define __attribute_pure__      __attribute__((pure))
-#define __attribute_const__     __attribute__((__const__))
-#define  noinline               __attribute__((noinline))
 #define __must_check            __attribute__((warn_unused_result))
 #define __compiler_offsetof(a,b) __builtin_offsetof(a,b)