patch-2.3.27 linux/fs/udf/udfdecl.h

Next file: linux/fs/ufs/balloc.c
Previous file: linux/fs/udf/misc.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.3.26/linux/fs/udf/udfdecl.h linux/fs/udf/udfdecl.h
@@ -3,10 +3,11 @@
 
 #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 @@
 #else
 
 #include <sys/types.h>
-#include <linux/udf_udf.h>
 
 #endif /* __KERNEL__ */
 

FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen (who was at: slshen@lbl.gov)