From: Randy Dunlap Simplify Makefile. Add Kconfig help. Changelog addition: 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'. Signed-off-by: Randy Dunlap Signed-off-by: Andrew Morton --- drivers/scsi/Kconfig | 8 ++++++++ drivers/scsi/Makefile | 6 ++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff -puN drivers/scsi/Kconfig~sata-acpi-build-update-makefile-kconfig drivers/scsi/Kconfig --- 25/drivers/scsi/Kconfig~sata-acpi-build-update-makefile-kconfig Tue Jan 17 16:15:15 2006 +++ 25-akpm/drivers/scsi/Kconfig Tue Jan 17 16:15:15 2006 @@ -603,6 +603,14 @@ config SCSI_SATA_ACPI bool depends on SCSI_SATA && ACPI 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" diff -puN drivers/scsi/Makefile~sata-acpi-build-update-makefile-kconfig drivers/scsi/Makefile --- 25/drivers/scsi/Makefile~sata-acpi-build-update-makefile-kconfig Tue Jan 17 16:15:15 2006 +++ 25-akpm/drivers/scsi/Makefile Tue Jan 17 16:15:15 2006 @@ -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 _