diff options
| author | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dtor_core@ameritech.net> | 2006-04-02 00:08:05 -0500 |
| commit | 95d465fd750897ab32462a6702fbfe1b122cbbc0 (patch) | |
| tree | 65c38b2f11c51bb6932e44dd6c92f15b0091abfe /include/asm-i386/stat.h | |
| parent | 642fde17dceceb56c7ba2762733ac688666ae657 (diff) | |
| parent | 683aa4012f53b2ada0f430487e05d37b0d94e90a (diff) | |
Manual merge with Linus.
Conflicts:
arch/powerpc/kernel/setup-common.c
drivers/input/keyboard/hil_kbd.c
drivers/input/mouse/hil_ptr.c
Diffstat (limited to 'include/asm-i386/stat.h')
| -rw-r--r-- | include/asm-i386/stat.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-i386/stat.h b/include/asm-i386/stat.h index b464f8020ec4..67eae78323ba 100644 --- a/include/asm-i386/stat.h +++ b/include/asm-i386/stat.h | |||
| @@ -58,8 +58,7 @@ struct stat64 { | |||
| 58 | long long st_size; | 58 | long long st_size; |
| 59 | unsigned long st_blksize; | 59 | unsigned long st_blksize; |
| 60 | 60 | ||
| 61 | unsigned long st_blocks; /* Number 512-byte blocks allocated. */ | 61 | unsigned long long st_blocks; /* Number 512-byte blocks allocated. */ |
| 62 | unsigned long __pad4; /* future possible st_blocks high bits */ | ||
| 63 | 62 | ||
| 64 | unsigned long st_atime; | 63 | unsigned long st_atime; |
| 65 | unsigned long st_atime_nsec; | 64 | unsigned long st_atime_nsec; |