diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
| commit | 94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch) | |
| tree | 5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /drivers/block/floppy.c | |
| parent | 3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff) | |
| parent | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'drivers/block/floppy.c')
| -rw-r--r-- | drivers/block/floppy.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c index 00895477155e..5eadbb9d4d71 100644 --- a/drivers/block/floppy.c +++ b/drivers/block/floppy.c | |||
| @@ -177,7 +177,7 @@ static int print_unex = 1; | |||
| 177 | #include <linux/interrupt.h> | 177 | #include <linux/interrupt.h> |
| 178 | #include <linux/init.h> | 178 | #include <linux/init.h> |
| 179 | #include <linux/devfs_fs_kernel.h> | 179 | #include <linux/devfs_fs_kernel.h> |
| 180 | #include <linux/device.h> | 180 | #include <linux/platform_device.h> |
| 181 | #include <linux/buffer_head.h> /* for invalidate_buffers() */ | 181 | #include <linux/buffer_head.h> /* for invalidate_buffers() */ |
| 182 | 182 | ||
| 183 | /* | 183 | /* |