From 563b471fc778e99c309c1221699530b4313cb63a Mon Sep 17 00:00:00 2001
From: okuji <okuji@localhost>
Date: Sun, 27 Aug 2000 11:21:25 +0000
Subject: [PATCH] don't include linux/fs.h.

---
 ChangeLog      | 6 ++++++
 grub/asmstub.c | 3 +--
 lib/device.c   | 4 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 72e2db43f..5ccb34159 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-08-27  OKUJI Yoshinori  <okuji@gnu.org>
+
+	* lib/device.c [__linux__]: Don't include linux/fs.h.
+	[!BLKGETSIZE] (BLKGETSIZE): Defined as _IO(0x12,96).
+	* grub/asmstub.c [__linux__]: Don't include linux/fs.h.
+	
 2000-08-27  OKUJI Yoshinori  <okuji@gnu.org>
 
 	Preserve a magic number used by Windows NT in a MBR. Shit!
diff --git a/grub/asmstub.c b/grub/asmstub.c
index e5f8fa5d8..0a42aa06a 100644
--- a/grub/asmstub.c
+++ b/grub/asmstub.c
@@ -48,10 +48,9 @@ int grub_stage2 (void);
 	((__GLIBC__ < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ < 1)))
 /* Maybe libc doesn't have large file support.  */
 #  include <linux/unistd.h>	/* _llseek */
-#  include <linux/fs.h>		/* BLKFLSBUF */
 # endif /* (GLIBC < 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR < 1)) */
 # ifndef BLKFLSBUF
-#  define BLKFLSBUF	_IO (0x12,97)
+#  define BLKFLSBUF	_IO (0x12,97)	/* flush buffer cache */
 # endif /* ! BLKFLSBUF */
 #endif /* __linux__ */
 
diff --git a/lib/device.c b/lib/device.c
index 60c757dcf..2c91b515c 100644
--- a/lib/device.c
+++ b/lib/device.c
@@ -45,7 +45,9 @@
 # include <linux/major.h>	/* FLOPPY_MAJOR */
 # include <linux/kdev_t.h>	/* MAJOR */
 # include <linux/cdrom.h>	/* CDROM_GET_CAPABILITY */
-# include <linux/fs.h>		/* BLKGETSIZE */
+# ifndef BLKGETSIZE
+#  define BLKGETSIZE	_IO(0x12,96)	/* return device size */
+# endif /* ! BLKGETSIZE */
 #endif /* __linux__ */
 
 #if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)