summaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorLinus Torvalds2005-11-12 01:29:22 +0100
committerLinus Torvalds2005-11-12 01:29:22 +0100
commit63f45b80947cb0819673860f6970f483e2cab21d (patch)
tree6b0d46c7da70786c15ee893d8a48aa866ae3742c /drivers/block
parent[PATCH] kill libata scsi_wait_req usage (make libata compile with scsi-misc c... (diff)
parentearlyuserspace/README: fix homonym err (diff)
downloadkernel-qcow2-linux-63f45b80947cb0819673860f6970f483e2cab21d.tar.gz
kernel-qcow2-linux-63f45b80947cb0819673860f6970f483e2cab21d.tar.xz
kernel-qcow2-linux-63f45b80947cb0819673860f6970f483e2cab21d.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/floppy.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 28002de783b6..13b8a9bed66e 100644
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -98,6 +98,10 @@
*/
/*
+ * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- 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.
@@ -158,10 +162,6 @@ static int print_unex = 1;
#define FDPATCHES
#include <linux/fdreg.h>
-/*
- * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
- */
-
#include <linux/fd.h>
#include <linux/hdreg.h>