diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /fs/udf/udfdecl.h | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'fs/udf/udfdecl.h')
| -rw-r--r-- | fs/udf/udfdecl.h | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/fs/udf/udfdecl.h b/fs/udf/udfdecl.h index 9ac5999b9..543d15ea9 100644 --- a/fs/udf/udfdecl.h +++ b/fs/udf/udfdecl.h @@ -1,12 +1,13 @@ #ifndef __UDF_DECL_H #define __UDF_DECL_H -#define UDF_VERSION_NOTICE "v0.8.9" +#define UDF_VERSION_NOTICE "v0.8.9.3" + +#include <linux/udf_udf.h> #ifdef __KERNEL__ #include <linux/types.h> -#include <linux/udf_udf.h> #include <linux/udf_fs.h> #include <linux/config.h> @@ -18,16 +19,14 @@ #error "The UDF Module Current Requires Kernel Version 2.3.7 or greater" #endif +#include <linux/fs.h> /* if we're not defined, we must be compiling outside of the kernel tree */ #if !defined(CONFIG_UDF_FS) && !defined(CONFIG_UDF_FS_MODULE) /* ... so override config */ #define CONFIG_UDF_FS_MODULE -#include <linux/fs.h> /* explicitly include udf_fs_sb.h and udf_fs_i.h */ #include <linux/udf_fs_sb.h> #include <linux/udf_fs_i.h> -#else -#include <linux/fs.h> /* also gets udf_fs_i.h and udf_fs_sb.h */ #endif struct dentry; @@ -113,7 +112,6 @@ extern int udf_sync_file(struct file *, struct dentry *); #else #include <sys/types.h> -#include <linux/udf_udf.h> #endif /* __KERNEL__ */ @@ -249,7 +247,7 @@ extern Uint32 udf64_low32(Uint64); extern Uint32 udf64_high32(Uint64); -extern time_t *udf_stamp_to_time(time_t *, timestamp); +extern time_t *udf_stamp_to_time(time_t *, long *, timestamp); extern timestamp *udf_time_to_stamp(timestamp *, time_t, long); extern time_t udf_converttime (struct ktm *); |