2004-11-20 16:20:25

by Jim Nelson

[permalink] [raw]
Subject: [PATCH] floppy: relocate devfs comment

Binary files linux-2.6.10-rc2-original/Documentation/.ioctl-number.txt.swp and linux-2.6.10-rc2/Documentation/.ioctl-number.txt.swp differ
diff -urN --exclude='*~' linux-2.6.10-rc2-original/drivers/block/floppy.c linux-2.6.10-rc2/drivers/block/floppy.c
--- linux-2.6.10-rc2-original/drivers/block/floppy.c 2004-11-15 21:38:15.000000000 -0500
+++ linux-2.6.10-rc2/drivers/block/floppy.c 2004-11-20 11:11:47.670201702 -0500
@@ -98,6 +98,10 @@
*/

/*
+ * 1998/1/21 -- Richard Gooch <[email protected]> -- devfs support
+ */
+
+/*
* 1998/05/07 -- Russell King -- More portability cleanups; moved definition of
* interrupt and dma channel to asm/floppy.h. Cleaned up some formatting &
* use of '0' for NULL.
@@ -159,10 +163,6 @@
#define FDPATCHES
#include <linux/fdreg.h>

-/*
- * 1998/1/21 -- Richard Gooch <[email protected]> -- devfs support
- */
-
#include <linux/fd.h>
#include <linux/hdreg.h>