diff -urN oldtree/include/linux/compiler-gcc3.h newtree/include/linux/compiler-gcc3.h
--- oldtree/include/linux/compiler-gcc3.h	2006-01-02 22:21:10.000000000 -0500
+++ newtree/include/linux/compiler-gcc3.h	2006-02-10 16:56:10.548560136 -0500
@@ -10,7 +10,7 @@
 #endif
 
 #if __GNUC_MINOR__ > 0
-# define __deprecated		__attribute__((deprecated))
+# define __deprecated
 #endif
 
 #if __GNUC_MINOR__ >= 3
@@ -27,6 +27,6 @@
 #endif
 
 #if __GNUC_MINOR__ >= 4
-#define __must_check		__attribute__((warn_unused_result))
+#define __must_check 
 #endif
 
diff -urN oldtree/include/linux/compiler-gcc3.h.orig newtree/include/linux/compiler-gcc3.h.orig
--- oldtree/include/linux/compiler-gcc3.h.orig	1969-12-31 19:00:00.000000000 -0500
+++ newtree/include/linux/compiler-gcc3.h.orig	2006-01-02 22:21:10.000000000 -0500
@@ -0,0 +1,32 @@
+/* Never include this file directly.  Include <linux/compiler.h> instead.  */
+
+/* These definitions are for GCC v3.x.  */
+#include <linux/compiler-gcc.h>
+
+#if __GNUC_MINOR__ >= 1
+# define inline		inline		__attribute__((always_inline))
+# define __inline__	__inline__	__attribute__((always_inline))
+# define __inline	__inline	__attribute__((always_inline))
+#endif
+
+#if __GNUC_MINOR__ > 0
+# define __deprecated		__attribute__((deprecated))
+#endif
+
+#if __GNUC_MINOR__ >= 3
+# define __attribute_used__	__attribute__((__used__))
+#else
+# define __attribute_used__	__attribute__((__unused__))
+#endif
+
+#define __attribute_pure__	__attribute__((pure))
+#define __attribute_const__	__attribute__((__const__))
+
+#if __GNUC_MINOR__ >= 1
+#define  noinline		__attribute__((noinline))
+#endif
+
+#if __GNUC_MINOR__ >= 4
+#define __must_check		__attribute__((warn_unused_result))
+#endif
+
diff -urN oldtree/include/linux/compiler-gcc4.h newtree/include/linux/compiler-gcc4.h
--- oldtree/include/linux/compiler-gcc4.h	2006-01-02 22:21:10.000000000 -0500
+++ newtree/include/linux/compiler-gcc4.h	2006-02-10 16:56:10.550559832 -0500
@@ -6,11 +6,11 @@
 #define inline			inline		__attribute__((always_inline))
 #define __inline__		__inline__	__attribute__((always_inline))
 #define __inline		__inline	__attribute__((always_inline))
-#define __deprecated		__attribute__((deprecated))
+#define __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 __must_check
 #define __compiler_offsetof(a,b) __builtin_offsetof(a,b)
 
diff -urN oldtree/include/linux/compiler-gcc4.h.orig newtree/include/linux/compiler-gcc4.h.orig
--- oldtree/include/linux/compiler-gcc4.h.orig	1969-12-31 19:00:00.000000000 -0500
+++ newtree/include/linux/compiler-gcc4.h.orig	2006-01-02 22:21:10.000000000 -0500
@@ -0,0 +1,16 @@
+/* Never include this file directly.  Include <linux/compiler.h> instead.  */
+
+/* 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)
+