From patchwork Fri Sep 18 19:41:10 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 48600 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 n8IJhLh3004221 for ; Fri, 18 Sep 2009 19:43:22 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751759AbZIRTmv (ORCPT ); Fri, 18 Sep 2009 15:42:51 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751769AbZIRTmv (ORCPT ); Fri, 18 Sep 2009 15:42:51 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:57290 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751759AbZIRTmu (ORCPT ); Fri, 18 Sep 2009 15:42:50 -0400 Received: from imap1.linux-foundation.org (imap1.linux-foundation.org [140.211.169.55]) by smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with ESMTP id n8IJfAnx007338 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 18 Sep 2009 12:41:11 -0700 Received: from localhost.localdomain (localhost [127.0.0.1]) by imap1.linux-foundation.org (8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id n8IJfAj8002565; Fri, 18 Sep 2009 12:41:10 -0700 Message-Id: <200909181941.n8IJfAj8002565@imap1.linux-foundation.org> Subject: [patch 7/8] thermal: add missing Kconfig dependency To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, JBeulich@novell.com, jbeulich@novell.com, mjg@redhat.com, rui.zhang@intel.com From: akpm@linux-foundation.org Date: Fri, 18 Sep 2009 12:41:10 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-3.513 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED X-Spam-Checker-Version: SpamAssassin 3.2.4-osdl_revision__1.47__ X-MIMEDefang-Filter: lf$Revision: 1.188 $ X-Scanned-By: MIMEDefang 2.63 on 140.211.169.13 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: "Jan Beulich" Otherwise THERMAL_HWMON can be selected when HWMON=n and THERMAL=n, which fails to build. Signed-off-by: Jan Beulich Cc: Zhang Rui Cc: Matthew Garrett Cc: Len Brown Signed-off-by: Andrew Morton --- drivers/thermal/Kconfig | 1 + 1 file changed, 1 insertion(+) diff -puN drivers/thermal/Kconfig~thermal-add-missing-kconfig-dependency drivers/thermal/Kconfig --- a/drivers/thermal/Kconfig~thermal-add-missing-kconfig-dependency +++ a/drivers/thermal/Kconfig @@ -15,6 +15,7 @@ menuconfig THERMAL config THERMAL_HWMON bool "Hardware monitoring support" + depends on THERMAL depends on HWMON=y || HWMON=THERMAL help The generic thermal sysfs driver's hardware monitoring support