From patchwork Fri Sep 4 07:49:50 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jan Beulich X-Patchwork-Id: 45595 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n848AZBb007644 for ; Fri, 4 Sep 2009 08:10:35 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756596AbZIDIJy (ORCPT ); Fri, 4 Sep 2009 04:09:54 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756578AbZIDIJy (ORCPT ); Fri, 4 Sep 2009 04:09:54 -0400 Received: from vpn.id2.novell.com ([195.33.99.129]:32911 "EHLO vpn.id2.novell.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756547AbZIDIJw convert rfc822-to-8bit (ORCPT ); Fri, 4 Sep 2009 04:09:52 -0400 Received: from EMEA1-MTA by vpn.id2.novell.com with Novell_GroupWise; Fri, 04 Sep 2009 08:49:49 +0100 Message-Id: <4AA0E2BE02000078000136C7@vpn.id2.novell.com> X-Mailer: Novell GroupWise Internet Agent 8.0.0 Date: Fri, 04 Sep 2009 08:49:50 +0100 From: "Jan Beulich" To: Cc: "Shaohua Li" , Subject: [PATCH] acpi: make ACPI_DOCK a tristate option again Mime-Version: 1.0 Content-Disposition: inline Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org I cannot follow the explanation in commit 898b054f3eec5921320ae8614b5bdd7b07ea5b43: If other drivers require the dock module to be loaded before them, they sould simply have a dependency on dock.ko. In the particular case mentioned (libata), this already is the case. However, in order to dock to really be compilable as a module, the select from libata also needs to be corrected: Boolean sub-options of tristate options selecting another tristate option should not do the select themselves, as that forces the selected option to Y. Instead, a conditional select in the base tristate option is needed. Signed-off-by: Jan Beulich Cc: Shaohua Li --- drivers/acpi/Kconfig | 2 +- drivers/acpi/Makefile | 2 +- drivers/acpi/osl.c | 1 + drivers/ata/Kconfig | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html --- linux-2.6.31-rc8/drivers/acpi/Kconfig 2009-08-28 14:54:27.000000000 +0200 +++ 2.6.31-rc8-acpi-dock-module/drivers/acpi/Kconfig 2009-08-19 13:28:12.000000000 +0200 @@ -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 --- linux-2.6.31-rc8/drivers/acpi/Makefile 2009-06-10 05:05:27.000000000 +0200 +++ 2.6.31-rc8-acpi-dock-module/drivers/acpi/Makefile 2009-08-19 13:31:37.000000000 +0200 @@ -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) += containe 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 --- linux-2.6.31-rc8/drivers/acpi/osl.c 2009-08-28 14:54:27.000000000 +0200 +++ 2.6.31-rc8-acpi-dock-module/drivers/acpi/osl.c 2009-09-04 08:47:50.000000000 +0200 @@ -803,6 +803,7 @@ acpi_status acpi_os_hotplug_execute(acpi { return __acpi_os_execute(0, function, context, 1); } +EXPORT_SYMBOL_GPL(acpi_os_hotplug_execute); void acpi_os_wait_events_complete(void *context) { --- linux-2.6.31-rc8/drivers/ata/Kconfig 2009-08-28 14:54:27.000000000 +0200 +++ 2.6.31-rc8-acpi-dock-module/drivers/ata/Kconfig 2009-08-19 13:28:35.000000000 +0200 @@ -8,6 +8,7 @@ menuconfig ATA depends on BLOCK depends on !(M32R || M68K) || BROKEN select SCSI + select ACPI_DOCK if ATA_ACPI ---help--- If you want to use a ATA hard disk, ATA tape drive, ATA CD-ROM or any other ATA device under Linux, say Y and make sure that you know @@ -29,7 +30,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.