From 2c6dff4bcc490a94c5d7024b1aaec4f504a76206 Mon Sep 17 00:00:00 2001 From: Matt Parnell Date: Tue, 13 Oct 2009 17:04:49 -0500 Subject: [PATCH] drivers/acpi: Dock really doesn't need to be built in 100% of the time drivers/ata: The same goes for you Signed-off-by: Matt Parnell --- drivers/acpi/Kconfig | 2 +- drivers/acpi/Makefile | 2 +- drivers/acpi/osl.c | 1 + drivers/ata/Kconfig | 4 +++- 4 files changed, 6 insertions(+), 3 deletions(-) diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index fb3f348..e95e562 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig @@ -171,7 +171,7 @@ config ACPI_FAN the module will be called fan. config ACPI_DOCK - bool "Dock" + tristate "Dock" depends on EXPERIMENTAL help This driver supports ACPI-controlled docking stations and removable diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile index 03a985b..e821bea 100644 --- a/drivers/acpi/Makefile +++ b/drivers/acpi/Makefile @@ -32,7 +32,6 @@ acpi-$(CONFIG_ACPI_SLEEP) += proc.o acpi-y += bus.o glue.o acpi-y += scan.o acpi-y += ec.o -acpi-$(CONFIG_ACPI_DOCK) += dock.o acpi-y += pci_root.o pci_link.o pci_irq.o pci_bind.o acpi-y += power.o acpi-y += system.o event.o @@ -54,6 +53,7 @@ obj-$(CONFIG_ACPI_CONTAINER) += container.o obj-$(CONFIG_ACPI_THERMAL) += thermal.o obj-$(CONFIG_ACPI_HOTPLUG_MEMORY) += acpi_memhotplug.o obj-$(CONFIG_ACPI_BATTERY) += battery.o +obj-$(CONFIG_ACPI_DOCK) += dock.o obj-$(CONFIG_ACPI_SBS) += sbshc.o obj-$(CONFIG_ACPI_SBS) += sbs.o diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index c9dc7d1..845d399 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c @@ -827,6 +827,7 @@ acpi_status acpi_os_hotplug_execute(acpi_osd_exec_callback function, { return __acpi_os_execute(0, function, context, 1); } +EXPORT_SYMBOL_GPL(acpi_os_hotplug_execute); void acpi_os_wait_events_complete(void *context) { diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index b17c57f..74b17d6 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -29,7 +29,6 @@ config ATA_NONSTANDARD 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. @@ -39,6 +38,9 @@ config ATA_ACPI power management, or other areas. You can disable this at kernel boot time by using the option libata.noacpi=1 + + NOTE: Some users may need to enable ACPI_DOCK for + everything to work correctly. config SATA_PMP bool "SATA Port Multiplier support" -- 1.6.5