Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec...

[firefly-linux-kernel-4.4.55.git] / drivers / ata / Kconfig

diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index e3e0e95c7aa5c55b4ce04d95da625acfef7a4385..c6b298d4c136c54a40fa7b4e4c13361000535642 100644 (file)
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -2,6 +2,14 @@
 # SATA/PATA driver configuration
 #
 
+config HAVE_PATA_PLATFORM
+       bool
+       help
+         This is an internal configuration node for any machine that
+         uses pata-platform driver to enable the relevant driver in the
+         configuration structure without having to submit endless patches
+         to update the PATA_PLATFORM entry.
+
 menuconfig ATA
        tristate "Serial ATA and Parallel ATA drivers"
        depends on HAS_IOMEM
@@ -408,11 +416,11 @@ config PATA_HPT37X
          If unsure, say N.
 
 config PATA_HPT3X2N
-       tristate "HPT 372N/302N PATA support"
+       tristate "HPT 371N/372N/302N PATA support"
        depends on PCI
        help
          This option enables support for the N variant HPT PATA
-         controllers via the new ATA layer
+         controllers via the new ATA layer.
 
          If unsure, say N.
 
@@ -773,14 +781,6 @@ config PATA_PCMCIA
 
          If unsure, say N.
 
-config HAVE_PATA_PLATFORM
-       bool
-       help
-         This is an internal configuration node for any machine that
-         uses pata-platform driver to enable the relevant driver in the
-         configuration structure without having to submit endless patches
-         to update the PATA_PLATFORM entry.
-
 config PATA_PLATFORM
        tristate "Generic platform device PATA support"
        depends on EMBEDDED || PPC || HAVE_PATA_PLATFORM