diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 16:43:29 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 16:43:29 -0800 |
| commit | 3f02d072d46bb409e8ca3cf16c0511f5c21adaf6 (patch) | |
| tree | baec074db38a5ceaaabbcee76f199acef43bb42a /drivers/block | |
| parent | 0238cb4e7583c521bb3538060f98a73e65f61324 (diff) | |
| parent | fb453d4b0b51ea71c9eb8192c61b768afeb7ee8a (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial
Diffstat (limited to 'drivers/block')
| -rw-r--r-- | drivers/block/floppy.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 374621a512e..d23b54332d7 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c @@ -242,7 +242,6 @@ static int allowed_drive_mask = 0x33; static int irqdma_allocated; -#define LOCAL_END_REQUEST #define DEVICE_NAME "floppy" #include <linux/blkdev.h> |