[PATCH] Disable floppy and the related ioctl32s on some platforms

From: Arun Sharma <arun.sharma@intel.com>

Based on some earlier discussion:

http://marc.theaimsgroup.com/?t=106015010700002&r=1&w=2

here's a new patch that attempts to disable BLK_DEV_FD on platforms which
don't support it.  The patch also attempts to remove the duplication of the
logic in compat_ioctl.h.

drivers/block/Kconfig

@@ -6,7 +6,7 @@ menu "Block devices"
 
 config BLK_DEV_FD
 	tristate "Normal floppy disk support"
-	depends on !X86_PC9800 && !ARCH_S390
+	depends on ISA || M68 || 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

include/linux/compat_ioctl.h

@@ -68,7 +68,7 @@ COMPATIBLE_IOCTL(HDIO_SET_MULTCOUNT)
 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)