Index: linux-2.6/drivers/block/Kconfig
===================================================================
--- linux-2.6/drivers/block/Kconfig	(revision 13274)
+++ linux-2.6/drivers/block/Kconfig	(working copy)
@@ -6,7 +6,7 @@
 
 config BLK_DEV_FD
 	tristate "Normal floppy disk support"
-	depends on !X86_PC9800
+	depends on ISA || M68K || SPARC64
 	---help---
 	  If you want to use the floppy disk drive(s) of your PC under Linux,
 	  say Y. Information about this driver, especially important for IBM
Index: linux-2.6/include/linux/compat_ioctl.h
===================================================================
--- linux-2.6/include/linux/compat_ioctl.h	(revision 13274)
+++ linux-2.6/include/linux/compat_ioctl.h	(working copy)
@@ -68,7 +68,7 @@
 COMPATIBLE_IOCTL(HDIO_DRIVE_CMD)
 COMPATIBLE_IOCTL(HDIO_SET_PIO_MODE)
 COMPATIBLE_IOCTL(HDIO_SET_NICE)
-#ifndef CONFIG_ARCH_S390
+#ifdef CONFIG_BLK_DEV_FD
 /* 0x02 -- Floppy ioctls */
 COMPATIBLE_IOCTL(FDMSGON)
 COMPATIBLE_IOCTL(FDMSGOFF)