diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 16:29:22 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-11-11 16:29:22 -0800 |
| commit | 63f45b80947cb0819673860f6970f483e2cab21d (patch) | |
| tree | 6b0d46c7da70786c15ee893d8a48aa866ae3742c /drivers | |
| parent | 85837ebdd7bb3e96a60e9b4c6af6c60d1273bc67 (diff) | |
| parent | b2d1a8adc9cf3bde32a18a1a1856641638a9c729 (diff) | |
| download | blackbird-op-linux-63f45b80947cb0819673860f6970f483e2cab21d.tar.gz blackbird-op-linux-63f45b80947cb0819673860f6970f483e2cab21d.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/block/floppy.c | 8 | ||||
| -rw-r--r-- | drivers/char/ftape/lowlevel/ftape-buffer.c | 1 |
2 files changed, 5 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> diff --git a/drivers/char/ftape/lowlevel/ftape-buffer.c b/drivers/char/ftape/lowlevel/ftape-buffer.c index 54af20cd9a2c..c706ff162771 100644 --- a/drivers/char/ftape/lowlevel/ftape-buffer.c +++ b/drivers/char/ftape/lowlevel/ftape-buffer.c @@ -33,6 +33,7 @@ #include "../lowlevel/ftape-rw.h" #include "../lowlevel/ftape-read.h" #include "../lowlevel/ftape-tracing.h" +#include "../lowlevel/ftape-buffer.h" /* DMA'able memory allocation stuff. */ |
