Branch b1_4

Move types.h file to top-level include to match b_cray.

diff --git a/lustre/include/lustre/types.h b/lustre/include/lustre/types.h
deleted file mode 100644 (file)
index 5389d37..0000000
--- a/lustre/include/lustre/types.h
+++ /dev/null
@@ -1,27 +0,0 @@
-#ifndef _LUSTRE_TYPES_H
-#define _LUSTRE_TYPES_H
-
-typedef unsigned short umode_t;
-
-#if (!defined(_LINUX_TYPES_H) && !defined(_BLKID_TYPES_H) && \
-       !defined(_EXT2_TYPES_H) && !defined(_I386_TYPES_H))
-
-/*
- * __xx is ok: it doesn't pollute the POSIX namespace. Use these in the
- * header files exported to user space
- */
-
-typedef __signed__ char __s8;
-typedef unsigned char __u8;
-
-typedef __signed__ short __s16;
-typedef unsigned short __u16;
-
-typedef __signed__ int __s32;
-typedef unsigned int __u32;
-
-typedef __signed__ long long __s64;
-typedef unsigned long long __u64;
-#endif
-
-#endif