From patchwork Mon Jun 29 08:13:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ingo Molnar X-Patchwork-Id: 32905 X-Patchwork-Delegate: lenb@kernel.org 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 n5T8ED6A023054 for ; Mon, 29 Jun 2009 08:14:13 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751763AbZF2IOI (ORCPT ); Mon, 29 Jun 2009 04:14:08 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752119AbZF2IOI (ORCPT ); Mon, 29 Jun 2009 04:14:08 -0400 Received: from mx2.mail.elte.hu ([157.181.151.9]:46143 "EHLO mx2.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751611AbZF2IOF (ORCPT ); Mon, 29 Jun 2009 04:14:05 -0400 Received: from elvis.elte.hu ([157.181.1.14]) by mx2.mail.elte.hu with esmtp (Exim) id 1MLBzi-0001bX-Ar from ; Mon, 29 Jun 2009 10:13:44 +0200 Received: by elvis.elte.hu (Postfix, from userid 1004) id A622A3E22C0; Mon, 29 Jun 2009 10:13:39 +0200 (CEST) Date: Mon, 29 Jun 2009 10:13:39 +0200 From: Ingo Molnar To: Len Brown , Corentin Chary , Randy Dunlap , Matthew Garrett Cc: Linus Torvalds , Andrew Morton , Linux Kernel Mailing List , linux-acpi@vger.kernel.org Subject: [PATCH, v3] eeepc-laptop: Fix build failure with HOTPLUG_PCI && !SYSFS (was: [git pull request] ACPI & driver patches for 2.6.31-rc1) Message-ID: <20090629081339.GA321@elte.hu> References: <20090629080754.GA28336@elte.hu> <20090629081016.GA31398@elte.hu> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090629081016.GA31398@elte.hu> User-Agent: Mutt/1.5.18 (2008-05-17) Received-SPF: neutral (mx2.mail.elte.hu: 157.181.1.14 is neither permitted nor denied by domain of elte.hu) client-ip=157.181.1.14; envelope-from=mingo@elte.hu; helo=elvis.elte.hu; X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.5 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org * Ingo Molnar wrote: > > The patch below fixes the build failure by turning the select > > lines into a single 'depends on' line. [...] > > i did the fix against the bisection point and the patch has a > conflict against later mainline - below is a merged up patch. > - select HOTPLUG > - select HOTPLUG_PCI if PCI > + select HOTPLUG > + select HOTPLUG_PCI if PCI uhm, not a very nice conflict resolution this is. The one below is actually tested ;-) Ingo --------------------> From de3e1cacc93ca48a288e27af5e82a365ba90020f Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 29 Jun 2009 10:07:54 +0200 Subject: [PATCH] eeepc-laptop: Fix build failure with HOTPLUG_PCI && !SYSFS (was: ACPI & driver patches for 2.6.31-rc1) FYI, there's a post-rc1 build regression with certain configs: drivers/built-in.o: In function `pci_hp_deregister': (.text+0xb166): undefined reference to `pci_hp_remove_module_link' drivers/built-in.o: In function `pci_hp_deregister': (.text+0xb19f): undefined reference to `pci_destroy_slot' drivers/built-in.o: In function `__pci_hp_register': (.text+0xb583): undefined reference to `pci_create_slot' drivers/built-in.o: In function `__pci_hp_register': (.text+0xb5b1): undefined reference to `pci_hp_create_module_link' make: *** [.tmp_vmlinux1] Error 1 Caused by: | 2b121bc262fa03c94e653b2d44356c2f86c1bcdc is first bad commit | commit 2b121bc262fa03c94e653b2d44356c2f86c1bcdc | Date: Thu Jun 25 13:25:36 2009 +0200 | | eeepc-laptop: Register as a pci-hotplug device The problem is caused by this portion of the commit: Signed-off-by: Ingo Molnar Acked-by: Len Brown --- drivers/platform/x86/Kconfig | 3 +-- 1 files changed, 1 insertions(+), 2 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 diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig index 4bc72d0..c0be866 100644 --- a/drivers/platform/x86/Kconfig +++ b/drivers/platform/x86/Kconfig @@ -356,10 +356,9 @@ config EEEPC_LAPTOP depends on INPUT depends on EXPERIMENTAL depends on RFKILL || RFKILL = n + depends on HOTPLUG_PCI select BACKLIGHT_CLASS_DEVICE select HWMON - select HOTPLUG - select HOTPLUG_PCI if PCI ---help--- This driver supports the Fn-Fx keys on Eee PC laptops.