diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:26:19 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-26 11:26:19 +0200 |
| commit | 88bef5a4074e0568cf54df410f41065c06694d8a (patch) | |
| tree | bc4d59f57ce315bcb16dad5491ab9983ab122d8a /include/linux/dirent.h | |
| parent | 054a3fd824705543322d787893de9f3755151517 (diff) | |
| parent | 024e8ac04453b3525448c31ef39848cf675ba6db (diff) | |
Merge branch 'linus' into x86/urgent
Diffstat (limited to 'include/linux/dirent.h')
| -rw-r--r-- | include/linux/dirent.h | 20 |
1 files changed, 0 insertions, 20 deletions
diff --git a/include/linux/dirent.h b/include/linux/dirent.h index 5d6023b8780..f072fb8d10a 100644 --- a/include/linux/dirent.h +++ b/include/linux/dirent.h @@ -1,23 +1,6 @@ #ifndef _LINUX_DIRENT_H #define _LINUX_DIRENT_H -struct dirent { - long d_ino; - __kernel_off_t d_off; - unsigned short d_reclen; - char d_name[256]; /* We must not include limits.h! */ -}; - -struct dirent64 { - __u64 d_ino; - __s64 d_off; - unsigned short d_reclen; - unsigned char d_type; - char d_name[256]; -}; - -#ifdef __KERNEL__ - struct linux_dirent64 { u64 d_ino; s64 d_off; @@ -26,7 +9,4 @@ struct linux_dirent64 { char d_name[0]; }; -#endif /* __KERNEL__ */ - - #endif |