From: Randy Dunlap <randy_d_dunlap@xxxxxxxxxxxxxxx> Simplify Makefile. Add Kconfig help. Signed-off-by: Randy Dunlap <randy_d_dunlap@xxxxxxxxxxxxxxx> --- drivers/scsi/Kconfig | 10 +++++++++- drivers/scsi/Makefile | 6 ++---- 2 files changed, 11 insertions(+), 5 deletions(-) --- linux-2616-rc4-ata.orig/drivers/scsi/Makefile +++ linux-2616-rc4-ata/drivers/scsi/Makefile @@ -163,10 +163,8 @@ ncr53c8xx-flags-$(CONFIG_SCSI_ZALON) \ CFLAGS_ncr53c8xx.o := $(ncr53c8xx-flags-y) $(ncr53c8xx-flags-m) zalon7xx-objs := zalon.o ncr53c8xx.o NCR_Q720_mod-objs := NCR_Q720.o ncr53c8xx.o -libata-objs := libata-core.o libata-scsi.o -ifeq ($(CONFIG_SCSI_SATA_ACPI),y) - libata-objs += libata-acpi.o -endif +libata-y := libata-core.o libata-scsi.o +libata-$(CONFIG_SCSI_SATA_ACPI) += libata-acpi.o oktagon_esp_mod-objs := oktagon_esp.o oktagon_io.o # Files generated that shall be removed upon make clean --- linux-2616-rc4-ata.orig/drivers/scsi/Kconfig +++ linux-2616-rc4-ata/drivers/scsi/Kconfig @@ -601,8 +601,16 @@ config SCSI_SATA_INTEL_COMBINED config SCSI_SATA_ACPI bool - depends on SCSI_SATA && ACPI + depends on SCSI_SATA && ACPI && PCI default y + help + This option adds support for SATA-related ACPI objects. + These ACPI objects add the ability to retrieve taskfiles + from the ACPI BIOS and write them to the disk controller. + These objects may be related to performance, security, + power management, or other areas. + You can disable this at kernel boot time by using the + option 'libata.noacpi'. config SCSI_BUSLOGIC tristate "BusLogic SCSI support" - : send the line "unsubscribe linux-ide" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
