diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-15 19:43:29 -0500 |
| 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 374621a512e0..d23b54332d7e 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
| @@ -242,7 +242,6 @@ static int allowed_drive_mask = 0x33; | |||
| 242 | 242 | ||
| 243 | static int irqdma_allocated; | 243 | static int irqdma_allocated; |
| 244 | 244 | ||
| 245 | #define LOCAL_END_REQUEST | ||
| 246 | #define DEVICE_NAME "floppy" | 245 | #define DEVICE_NAME "floppy" |
| 247 | 246 | ||
| 248 | #include <linux/blkdev.h> | 247 | #include <linux/blkdev.h> |