aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/floppy.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 19:29:22 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-11 19:29:22 -0500
commit63f45b80947cb0819673860f6970f483e2cab21d (patch)
tree6b0d46c7da70786c15ee893d8a48aa866ae3742c /drivers/block/floppy.c
parent85837ebdd7bb3e96a60e9b4c6af6c60d1273bc67 (diff)
parentb2d1a8adc9cf3bde32a18a1a1856641638a9c729 (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/block/floppy.c')
-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 @@
98 */ 98 */
99 99
100/* 100/*
101 * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
102 */
103
104/*
101 * 1998/05/07 -- Russell King -- More portability cleanups; moved definition of 105 * 1998/05/07 -- Russell King -- More portability cleanups; moved definition of
102 * interrupt and dma channel to asm/floppy.h. Cleaned up some formatting & 106 * interrupt and dma channel to asm/floppy.h. Cleaned up some formatting &
103 * use of '0' for NULL. 107 * use of '0' for NULL.
@@ -158,10 +162,6 @@ static int print_unex = 1;
158#define FDPATCHES 162#define FDPATCHES
159#include <linux/fdreg.h> 163#include <linux/fdreg.h>
160 164
161/*
162 * 1998/1/21 -- Richard Gooch <rgooch@atnf.csiro.au> -- devfs support
163 */
164
165#include <linux/fd.h> 165#include <linux/fd.h>
166#include <linux/hdreg.h> 166#include <linux/hdreg.h>
167 167