---- ./disk-utils/raw.c.orig Sat Jun 30 13:03:56 2001
-+++ ./disk-utils/raw.c Sat Jun 30 13:54:54 2001
+diff -ur util-linux-2.12q.org/configure util-linux-2.12q/configure
+--- util-linux-2.12q.org/configure 2004-12-20 23:20:35.000000000 +0100
++++ util-linux-2.12q/configure 2005-02-27 19:22:06.000000000 +0100
+@@ -45,6 +45,7 @@
+ # 13. For nfsmount: does the output of rpcgen compile?
+ # 14. For fsck.cramfs, mkfs.cramfs: do we have libz?
+ # 15. For mount, do we have blkid?
++# 16. For raw.c: does <sys/raw.h> exist?
+
+ rm -f make_include defines.h
+
+@@ -662,6 +663,13 @@
+ rm -f conftest conftest.c
+
+ #
++# 16. For raw.c: does <sys/raw.h> exist?
++#
++if ./testincl "sys/raw.h"; then
++ echo "ADD_RAW=yes" >> make_include
++fi
++
++#
+ # 13. For nfsmount: does the output of rpcgen compile?
+ #
+ # On some systems the output of rpcgen compiles with warnings
+diff -ur util-linux-2.12q.org/disk-utils/raw.c util-linux-2.12q/disk-utils/raw.c
+--- util-linux-2.12q.org/disk-utils/raw.c 2002-03-08 23:58:37.000000000 +0100
++++ util-linux-2.12q/disk-utils/raw.c 2005-02-27 19:21:29.000000000 +0100
@@ -19,7 +19,7 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
#include <linux/major.h>
#ifdef OLD_RAW_DEVS
-@@ -30,6 +30,8 @@
- #define RAWDEVDIR "/dev/raw/"
+@@ -31,6 +31,8 @@
#endif
+ #define DEVFS_RAWCTLDEV "/dev/raw/rawctl"
+#undef __LINUX_RAW_H
+#define __LINUX_RAW_H __SYSTEM_RAW_H
char * progname;
int do_query = 0;
---- ./configure.orig Sat Jun 30 13:13:31 2001
-+++ ./configure Sat Jun 30 13:52:00 2001
-@@ -35,7 +35,7 @@
- # 11. For pivot_root.c: does <linux/unistd.h> define __NR_pivot_root?
- # 12. For hwclock.c: does struct tm have a field tm_gmtoff?
- # 13. For nfsmount: does the output of rpcgen compile?
--# 14. For raw.c: does <linux/raw.h> exist?
-+# 14. For raw.c: does <sys/raw.h> exist?
-
- rm -f make_include defines.h
-
-@@ -601,9 +601,9 @@
- rm -f conftestx.o conftestl.o
-
- #
--# 14. For raw.c: does <linux/raw.h> exist?
-+# 14. For raw.c: does <sys/raw.h> exist?
- #
--if ./testincl "linux/raw.h"; then
-+if ./testincl "sys/raw.h"; then
- echo "ADD_RAW=yes" >> make_include
- fi
-