packages/utils/dosfstools/patches/002-linux_26_headers.patch
nbd 3ba603eb8f fix dosfstools compile
git-svn-id: svn://svn.openwrt.org/openwrt/packages@12125 3c298f89-4303-0410-b956-a3cf2f4a3e73
2008-08-05 07:02:48 +00:00

70 lines
1.5 KiB
Diff

--- a/dosfsck/common.h
+++ b/dosfsck/common.h
@@ -4,9 +4,7 @@
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-# define __KERNEL__
-# include <asm/types.h>
-# undef __KERNEL__
+#include <linux/types.h>
# define MSDOS_FAT12 4084 /* maximum number of clusters in a 12 bit FAT */
#endif
--- a/dosfsck/file.c
+++ b/dosfsck/file.c
@@ -18,9 +18,7 @@
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-# define __KERNEL__
-# include <asm/types.h>
-# undef __KERNEL__
+#include <linux/types.h>
#endif
#include <linux/msdos_fs.h>
--- a/dosfsck/io.c
+++ b/dosfsck/io.c
@@ -19,6 +19,10 @@
#include <sys/ioctl.h>
#include <errno.h>
#include <fcntl.h>
+#include <linux/version.h>
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
+#include <linux/types.h>
+#endif
#include <linux/fd.h>
#include "dosfsck.h"
--- a/mkdosfs/mkdosfs.c
+++ b/mkdosfs/mkdosfs.c
@@ -68,9 +68,7 @@
#include <linux/version.h>
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-# define __KERNEL__
-# include <asm/types.h>
-# undef __KERNEL__
+#include <linux/types.h>
#endif
#if __BYTE_ORDER == __BIG_ENDIAN
--- a/dosfsck/dosfsck.h
+++ b/dosfsck/dosfsck.h
@@ -15,13 +15,7 @@
#define _LINUX_FS_H /* hack to avoid inclusion of <linux/fs.h> */
#include <linux/version.h>
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 0)
-# define __KERNEL__
-# include <asm/types.h>
-# include <asm/byteorder.h>
-# undef __KERNEL__
-#endif
-
+#include <linux/types.h>
#include <linux/msdos_fs.h>
#undef CF_LE_W