Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/i2c-2.6

[karo-tx-linux.git] / fs / xfs / xfs.h

diff --git a/fs/xfs/xfs.h b/fs/xfs/xfs.h
index 99b50d2bda9bd77d3aa4085fc47dcfc577586703..1a48dbb902a7bf214c1114dea3c0dfd5711fda83 100644 (file)
--- a/fs/xfs/xfs.h
+++ b/fs/xfs/xfs.h
@@ -17,12 +17,5 @@
  */
 #ifndef __XFS_H__
 #define __XFS_H__
-
-#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
 #include <linux-2.6/xfs_linux.h>
-#else
-#include <linux-2.4/xfs_linux.h>
-#endif
-
 #endif /* __XFS_H__ */