---

yaml --- r: 116313 b: refs/heads/master c: c84d9bb h: refs/heads/master i: 116311: a9fcf2d v: v3
git-mirror · Oct 17, 2008 · 48e4c3d · 48e4c3d
1 parent d80e6b8
commit 48e4c3d
Show file tree

Hide file tree

Showing 5 changed files with 328 additions and 312 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cedd120cac61fa149ba215eabc57b2578068be00
+refs/heads/master: c84d9bbe7c77aea7e1194da056d44a2ed982e72b
diff --git a/trunk/drivers/ide/Makefile b/trunk/drivers/ide/Makefile
@@ -39,7 +39,7 @@ obj-$(CONFIG_BLK_DEV_IDEPNP)		+= ide-pnp.o
 
 ide-disk_mod-y += ide-gd.o ide-disk.o ide-disk_ioctl.o
 ide-cd_mod-y += ide-cd.o ide-cd_ioctl.o ide-cd_verbose.o
-ide-floppy_mod-y += ide-floppy.o ide-floppy_ioctl.o
+ide-floppy_mod-y += ide-gd-floppy.o ide-floppy.o ide-floppy_ioctl.o
 
 ifeq ($(CONFIG_IDE_PROC_FS), y)
 	ide-disk_mod-y += ide-disk_proc.o