diff options
| author | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@titanic.(none)> | 2005-05-20 16:27:44 -0400 |
| commit | ad34ea2cc3845ef4dcd7d12fb0fa8484734bd672 (patch) | |
| tree | ad434400f5ecaa33b433c8f830e40792d8d6c05c /fs/isofs/util.c | |
| parent | 90356ac3194bf91a441a5f9c3067af386ef62462 (diff) | |
| parent | 88d7bd8cb9eb8d64bf7997600b0d64f7834047c5 (diff) | |
merge by hand - fix up rejections in Documentation/DocBook/Makefile
Diffstat (limited to 'fs/isofs/util.c')
| -rw-r--r-- | fs/isofs/util.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/fs/isofs/util.c b/fs/isofs/util.c index 3f6d9c1ac95a..01e1ee7a998b 100644 --- a/fs/isofs/util.c +++ b/fs/isofs/util.c | |||
| @@ -2,9 +2,7 @@ | |||
| 2 | * linux/fs/isofs/util.c | 2 | * linux/fs/isofs/util.c |
| 3 | */ | 3 | */ |
| 4 | 4 | ||
| 5 | #include <linux/time.h> | 5 | #include "isofs.h" |
| 6 | #include <linux/fs.h> | ||
| 7 | #include <linux/iso_fs.h> | ||
| 8 | 6 | ||
| 9 | /* | 7 | /* |
| 10 | * We have to convert from a MM/DD/YY format to the Unix ctime format. | 8 | * We have to convert from a MM/DD/YY format to the Unix ctime format. |
| @@ -80,4 +78,3 @@ int iso_date(char * p, int flag) | |||
| 80 | } | 78 | } |
| 81 | return crtime; | 79 | return crtime; |
| 82 | } | 80 | } |
| 83 | |||