aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarlos R. Mafra <crmafra@aei.mpg.de>2009-12-22 13:45:39 -0800
committerLen Brown <len.brown@intel.com>2009-12-24 00:04:40 -0500
commit2370b5ed03030d554adb345778d5edecab7a510c (patch)
treeba1eb065ed3875de2986da8bb6f50df2855269dc
parent0f1006b1f2b7862e35973c53cc4f99bea65d5a1d (diff)
downloadlinux-linaro-2370b5ed03030d554adb345778d5edecab7a510c.tar.gz
ACPI: do not select ACPI_DOCK from ATA_ACPI
In March 2008 commit 0ac4a3c2fbbcadc3e96e4dc47d4ae802d66e6f67 ("ACPI: fix ATA_ACPI build") made CONFIG_ACPI_DOCK be selected by CONFIG_ATA_ACPI because of a build error when CONFIG_ATA_ACPI=y and CONFIG_ACPI_DOCK=m. However, in September 2008 commit 898b054f3eec5921320ae8614b5bdd7b07ea5b43 ("dock: make dock driver not a module") removed the possibility of having CONFIG_ACPI_DOCK=m and therefore there is no need for selecting it when CONFIG_ATA_ACPI=y. This makes the kernel ~5 Kb smaller for people who don't have a dock by allowing them to not have ACPI_DOCK compiled-in because of ATA_ACPI=y. Signed-off-by: Carlos R. Mafra <crmafra@aei.mpg.de> Cc: Shaohua Li <shaohua.li@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Len Brown <len.brown@intel.com>
-rw-r--r--drivers/ata/Kconfig1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig
index 85844d05384..56c6374a398 100644
--- a/drivers/ata/Kconfig
+++ b/drivers/ata/Kconfig
@@ -40,7 +40,6 @@ config ATA_VERBOSE_ERROR
config ATA_ACPI
bool "ATA ACPI Support"
depends on ACPI && PCI
- select ACPI_DOCK
default y
help
This option adds support for ATA-related ACPI objects.