Merge branch 'linus' into x86/memory-corruption-check

[linux-2.6-omap-h63xx.git] / drivers / ide / Kconfig

diff --git a/drivers/ide/Kconfig b/drivers/ide/Kconfig
index fc735ab08ff4f8f3f80c82e911242a2f54f84758..b50b5dac95b0f75a49d9da5aeae42e1db2d87a2c 100644 (file)
--- a/drivers/ide/Kconfig
+++ b/drivers/ide/Kconfig
@@ -131,29 +131,6 @@ config BLK_DEV_IDEDISK
 
          If unsure, say Y.
 
-config IDEDISK_MULTI_MODE
-       bool "Use multiple sector mode for Programmed Input/Output by default"
-       help
-         This setting is irrelevant for most IDE disks, with direct memory
-         access, to which multiple sector mode does not apply. Multiple sector
-         mode is a feature of most modern IDE hard drives, permitting the
-         transfer of multiple sectors per Programmed Input/Output interrupt,
-         rather than the usual one sector per interrupt. When this feature is
-         enabled, it can reduce operating system overhead for disk Programmed
-         Input/Output. On some systems, it also can increase the data
-         throughput of Programmed Input/Output. Some drives, however, seemed
-         to run slower with multiple sector mode enabled. Some drives claimed
-         to support multiple sector mode, but lost data at some settings.
-         Under rare circumstances, such failures could result in massive
-         filesystem corruption.
-
-         If you get the following error, try to say Y here:
-
-         hda: set_multmode: status=0x51 { DriveReady SeekComplete Error }
-         hda: set_multmode: error=0x04 { DriveStatusError }
-
-         If in doubt, say N.
-
 config BLK_DEV_IDECS
        tristate "PCMCIA IDE support"
        depends on PCMCIA
@@ -292,6 +269,20 @@ config IDE_GENERIC
        tristate "generic/default IDE chipset support"
        depends on ALPHA || X86 || IA64 || M32R || MIPS
        help
+         This is the generic IDE driver.  This driver attaches to the
+         fixed legacy ports (e.g. on PCs 0x1f0/0x170, 0x1e8/0x168 and
+         so on).  Please note that if this driver is built into the
+         kernel or loaded before other ATA (IDE or libata) drivers
+         and the controller is located at legacy ports, this driver
+         may grab those ports and thus can prevent the controller
+         specific driver from attaching.
+
+         Also, currently, IDE generic doesn't allow IRQ sharing
+         meaning that the IRQs it grabs won't be available to other
+         controllers sharing those IRQs which usually makes drivers
+         for those controllers fail.  Generally, it's not a good idea
+         to load IDE generic driver on modern systems.
+
          If unsure, say N.
 
 config BLK_DEV_PLATFORM
@@ -766,10 +757,6 @@ config BLK_DEV_IDEDMA_PMAC
          to transfer data to and from memory.  Saying Y is safe and improves
          performance.
 
-config BLK_DEV_IDE_SWARM
-       tristate "IDE for Sibyte evaluation boards"
-       depends on SIBYTE_SB1xxx_SOC
-
 config BLK_DEV_IDE_AU1XXX
        bool "IDE for AMD Alchemy Au1200"
        depends on SOC_AU1200