From patchwork Fri Mar 11 00:49:48 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 626801 X-Patchwork-Delegate: paul@pwsan.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p2B0nfQB020013 for ; Fri, 11 Mar 2011 00:49:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753954Ab1CKAtk (ORCPT ); Thu, 10 Mar 2011 19:49:40 -0500 Received: from na3sys009aog114.obsmtp.com ([74.125.149.211]:53979 "EHLO na3sys009aog114.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754029Ab1CKAtk (ORCPT ); Thu, 10 Mar 2011 19:49:40 -0500 Received: from source ([74.125.83.52]) (using TLSv1) by na3sys009aob114.postini.com ([74.125.148.12]) with SMTP ID DSNKTXlxo6XQI/TeJh57WVa3FswuO0n7mX7z@postini.com; Thu, 10 Mar 2011 16:49:40 PST Received: by mail-gw0-f52.google.com with SMTP id 15so1542969gwj.25 for ; Thu, 10 Mar 2011 16:49:39 -0800 (PST) Received: by 10.236.109.225 with SMTP id s61mr2002091yhg.284.1299804578960; Thu, 10 Mar 2011 16:49:38 -0800 (PST) Received: from localhost (c-24-18-179-55.hsd1.wa.comcast.net [24.18.179.55]) by mx.google.com with ESMTPS id k5sm2505108yhm.21.2011.03.10.16.49.37 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 10 Mar 2011 16:49:38 -0800 (PST) From: Kevin Hilman To: Paul Walmsely Cc: linux-omap@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH] OMAP2+: voltage: don't build voltage layer when !CONFIG_PM Date: Thu, 10 Mar 2011 16:49:48 -0800 Message-Id: <1299804588-13544-1-git-send-email-khilman@ti.com> X-Mailer: git-send-email 1.7.4 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 11 Mar 2011 00:49:41 +0000 (UTC) diff --git a/arch/arm/mach-omap2/Makefile b/arch/arm/mach-omap2/Makefile index 4edac5d..82b2a67 100644 --- a/arch/arm/mach-omap2/Makefile +++ b/arch/arm/mach-omap2/Makefile @@ -89,12 +89,14 @@ obj-$(CONFIG_ARCH_OMAP4) += prcm.o cm2xxx_3xxx.o cminst44xx.o \ vp44xx_data.o # OMAP voltage domains +ifeq ($(CONFIG_PM),y) voltagedomain-common := voltage.o obj-$(CONFIG_ARCH_OMAP2) += $(voltagedomain-common) obj-$(CONFIG_ARCH_OMAP3) += $(voltagedomain-common) \ voltagedomains3xxx_data.o obj-$(CONFIG_ARCH_OMAP4) += $(voltagedomain-common) \ voltagedomains44xx_data.o +endif # OMAP powerdomain framework powerdomain-common += powerdomain.o powerdomain-common.o