From mboxrd@z Thu Jan 1 00:00:00 1970 From: Catalin Marinas Subject: Re: [PATCH v4 05/18] ARM64 / ACPI: Introduce sleep-arm.c Date: Fri, 12 Sep 2014 15:51:02 +0100 Message-ID: <20140912145102.GB5532@arm.com> References: <1410530416-30200-1-git-send-email-hanjun.guo@linaro.org> <1410530416-30200-6-git-send-email-hanjun.guo@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Return-path: In-Reply-To: <1410530416-30200-6-git-send-email-hanjun.guo@linaro.org> Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org To: Hanjun Guo Cc: "Rafael J. Wysocki" , Mark Rutland , Olof Johansson , "grant.likely@linaro.org" , Will Deacon , "graeme.gregory@linaro.org" , Arnd Bergmann , Sudeep Holla , "jcm@redhat.com" , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Rob Herring , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles Garcia-Tobin , linux-acpi@vger.ker List-Id: linux-acpi@vger.kernel.org On Fri, Sep 12, 2014 at 03:00:03PM +0100, Hanjun Guo wrote: > --- a/drivers/acpi/Makefile > +++ b/drivers/acpi/Makefile > @@ -23,7 +23,11 @@ acpi-y += nvs.o > > # Power management related files > acpi-y += wakeup.o > +ifeq ($(ARCH), arm64) > +acpi-y += sleep-arm.o > +else # X86, IA64 > acpi-y += sleep.o > +endif > acpi-y += device_pm.o > acpi-$(CONFIG_ACPI_SLEEP) += proc.o What about: -acpi-y += sleep.o +acpi-$(CONFIG_ACPI_SLEEP) += sleep.o and make CONFIG_ACPI_SLEEP depend on !ARM64? Does the kernel compile if you disable CONFIG_ACPI_SLEEP? -- Catalin