Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754053AbYHJHKj (ORCPT ); Sun, 10 Aug 2008 03:10:39 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751934AbYHJHKa (ORCPT ); Sun, 10 Aug 2008 03:10:30 -0400 Received: from relay03.mail-hub.dodo.com.au ([123.2.6.238]:49434 "EHLO relay03.mail-hub.dodo.com.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751785AbYHJHK3 (ORCPT ); Sun, 10 Aug 2008 03:10:29 -0400 From: Grant Coady To: Grant Coady Cc: Alan Cox , Krzysztof Halasa , "Robert P. J. Day" , Grant Coady , Linux Kernel Mailing List Subject: [RFC PATCH] cleanup Serial ATA and Parallel ATA Kconfig try3 Date: Sun, 10 Aug 2008 17:10:17 +1000 Organization: http://bugsplatter.id.au/ Reply-To: Grant Coady Message-ID: References: <20080808172629.232bed01@lxorguk.ukuu.org.uk> <20080809103331.1d475d5c@lxorguk.ukuu.org.uk> <20080809141028.14db9bc7@lxorguk.ukuu.org.uk> <20080809215918.32f25c4b@lxorguk.ukuu.org.uk> In-Reply-To: X-Mailer: Forte Agent 2.0/32.652 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 6492 Lines: 226 On Sun, 10 Aug 2008 11:07:30 +1000, Grant Coady wrote: Okay, third time lucky? This one brings back the indentation and is smaller than the last patch too. Grant. From: Grant Coady Cleanup ATA Kconfig, this patch replaces earlier RFC patches. Cleanup ATA Kconfig, hide the SFF option behind new PATA and SATA menu items, sort drivers into a single list, add missing "if unsure, say..." help text, this version gets the items indented in make menuconfig, some inconsistent text resolved, and one long (>80 col) help line split. Signed-off-by: Grant Coady --- Kconfig | 157 ++++++++++++++++------------------------------------------------ 1 files changed, 40 insertions(+), 117 deletions(-) --- linux-2.6.27-rc2/drivers/ata/Kconfig 2008-07-14 07:51:29.000000000 +1000 +++ linux-2.6.27-rc2d/drivers/ata/Kconfig 2008-08-10 17:05:01.906675949 +1000 @@ -73,155 +73,78 @@ If unsure, say N. -config ATA_SFF - bool "ATA SFF support" +config SATA_PMP + bool "SATA Port Multiplier support" default y help - This option adds support for ATA controllers with SFF - compliant or similar programming interface. - - SFF is the legacy IDE interface that has been around since - the dawn of time. Almost all PATA controllers have an - SFF interface. Many SATA controllers have an SFF interface - when configured into a legacy compatibility mode. - - For users with exclusively modern controllers like AHCI, - Silicon Image 3124, or Marvell 6440, you may choose to - disable this uneeded SFF support. + This option adds support for SATA Port Multipliers + (the SATA version of an ethernet hub, or SAS expander). If unsure, say Y. -if ATA_SFF - -config SATA_SVW - tristate "ServerWorks Frodo / Apple K2 SATA support" - depends on PCI - help - This option enables support for Broadcom/Serverworks/Apple K2 - SATA support. - - If unsure, say N. - -config ATA_PIIX - tristate "Intel ESB, ICH, PIIX3, PIIX4 PATA/SATA support" - depends on PCI - help - This option enables support for ICH5/6/7/8 Serial ATA - and support for PATA on the Intel ESB/ICH/PIIX3/PIIX4 series - host controllers. - - If unsure, say N. - -config SATA_MV - tristate "Marvell SATA support (HIGHLY EXPERIMENTAL)" - depends on EXPERIMENTAL - help - This option enables support for the Marvell Serial ATA family. - Currently supports 88SX[56]0[48][01] chips. - - If unsure, say N. - -config SATA_NV - tristate "NVIDIA SATA support" +config SATA_SIL24 + tristate "Silicon Image 3124/3132 SATA support" depends on PCI help - This option enables support for NVIDIA Serial ATA. + This option enables support for Silicon Image 3124/3132 Serial ATA. If unsure, say N. -config PDC_ADMA - tristate "Pacific Digital ADMA support" - depends on PCI - help - This option enables support for Pacific Digital ADMA controllers - - If unsure, say N. - -config SATA_QSTOR - tristate "Pacific Digital SATA QStor support" - depends on PCI - help - This option enables support for Pacific Digital Serial ATA QStor. - - If unsure, say N. - -config SATA_PROMISE - tristate "Promise SATA TX2/TX4 support" - depends on PCI - help - This option enables support for Promise Serial ATA TX2/TX4. - - If unsure, say N. - -config SATA_SX4 - tristate "Promise SATA SX4 support" - depends on PCI && EXPERIMENTAL +config ATA_SFF_PATA + bool "Parallel ATA (PATA) support" + default y help - This option enables support for Promise Serial ATA SX4. - - If unsure, say N. + Say Y here if you want support for Parallel ATA (PATA) devices, + also known as IDE devices. -config SATA_SIL - tristate "Silicon Image SATA support" - depends on PCI - help - This option enables support for Silicon Image Serial ATA. + This option enables a list of available PATA drivers. - If unsure, say N. + You may turn this option off if running AHCI or similar devices. -config SATA_SIS - tristate "SiS 964/965/966/180 SATA support" - depends on PCI - select PATA_SIS - help - This option enables support for SiS Serial ATA on - SiS 964/965/966/180 and Parallel ATA on SiS 180. - The PATA support for SiS 180 requires additionally to - enable the PATA_SIS driver in the config. - If unsure, say N. + If unsure, say Y. -config SATA_ULI - tristate "ULi Electronics SATA support" - depends on PCI +config ATA_SFF_SATA + bool "Serial ATA (SATA) support" + default y help - This option enables support for ULi Electronics SATA. + Say Y here if you want support for Serial ATA (SATA) devices. - If unsure, say N. + This option enables a list of available SATA drivers. -config SATA_VIA - tristate "VIA SATA support" - depends on PCI - help - This option enables support for VIA Serial ATA. + You may turn this option off if running AHCI or similar devices. - If unsure, say N. - -config SATA_VITESSE - tristate "VITESSE VSC-7174 / INTEL 31244 SATA support" - depends on PCI - help - This option enables support for Vitesse VSC7174 and Intel 31244 Serial ATA. + If unsure, say Y. - If unsure, say N. +config ATA_SFF + bool + default y + depends on ATA_SFF_PATA || ATA_SFF_SATA -config SATA_INIC162X - tristate "Initio 162x SATA support" - depends on PCI - help - This option enables support for Initio 162x Serial ATA. +if ATA_SFF config PATA_ACPI tristate "ACPI firmware driver for PATA" - depends on ATA_ACPI + depends on ATA_ACPI && ATA_SFF_PATA help This option enables an ACPI method driver which drives motherboard PATA controller interfaces through the ACPI firmware in the BIOS. This driver can sometimes handle otherwise unsupported hardware. + If unsure, say Y. + +config PATA_ICSIDE + tristate "Acorn ICS PATA support" + depends on ARM && ARCH_ACORN && ATA_SFF_PATA + help + On Acorn systems, say Y here if you wish to use the ICS PATA + interface card. This is not required for ICS partition support. + + If unsure, say N. + config PATA_ALI tristate "ALi PATA support (Experimental)" - depends on PCI && EXPERIMENTAL + depends on PCI && ATA_SFF_PATA && EXPERIMENTAL help This option enables support for the ALi ATA interfaces found on the many ALi chipsets. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/