Merge master.kernel.org:/home/rmk/linux-2.6-drvmodel

[linux-2.6-omap-h63xx.git] / drivers / block / floppy.c

diff --git a/drivers/block/floppy.c b/drivers/block/floppy.c
index 00895477155e69aaac17792f253681d0e4c0a2d0..5eadbb9d4d71afdff8d74ae5e5e4f5b00c05a996 100644 (file)
--- a/drivers/block/floppy.c
+++ b/drivers/block/floppy.c
@@ -177,7 +177,7 @@ static int print_unex = 1;
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/devfs_fs_kernel.h>
-#include <linux/device.h>
+#include <linux/platform_device.h>
 #include <linux/buffer_head.h> /* for invalidate_buffers() */
 
 /*