From patchwork Wed Jan 12 20:20:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Randy Dunlap X-Patchwork-Id: 474821 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 p0CKKs8V025093 for ; Wed, 12 Jan 2011 20:20:55 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755399Ab1ALUUd (ORCPT ); Wed, 12 Jan 2011 15:20:33 -0500 Received: from rcsinet10.oracle.com ([148.87.113.121]:53895 "EHLO rcsinet10.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752263Ab1ALUUd (ORCPT ); Wed, 12 Jan 2011 15:20:33 -0500 Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) by rcsinet10.oracle.com (Switch-3.4.2/Switch-3.4.2) with ESMTP id p0CKKKML012498 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 12 Jan 2011 20:20:21 GMT Received: from acsmt355.oracle.com (acsmt355.oracle.com [141.146.40.155]) by acsinet15.oracle.com (Switch-3.4.2/Switch-3.4.1) with ESMTP id p0CKKILR015846; Wed, 12 Jan 2011 20:20:18 GMT Received: from abhmt015.oracle.com by acsmt353.oracle.com with ESMTP id 920102341294863616; Wed, 12 Jan 2011 12:20:16 -0800 Received: from chimera.site (/173.50.240.230) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Wed, 12 Jan 2011 12:20:15 -0800 Date: Wed, 12 Jan 2011 12:20:14 -0800 From: Randy Dunlap To: Stephen Rothwell , "Rafael J. Wysocki" Cc: linux-next@vger.kernel.org, LKML , Jiri Slaby , lenb@kernel.org, linux-acpi@vger.kernel.org Subject: [PATCH -next] x86/e820: fix build when ACPI is disabled Message-Id: <20110112122014.2d8455d7.randy.dunlap@oracle.com> In-Reply-To: <20110112141822.c29314c4.sfr@canb.auug.org.au> References: <20110112141822.c29314c4.sfr@canb.auug.org.au> Organization: Oracle Linux Eng. X-Mailer: Sylpheed 2.7.1 (GTK+ 2.16.6; x86_64-unknown-linux-gnu) Mime-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@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]); Wed, 12 Jan 2011 20:20:55 +0000 (UTC) --- linux-next-20110112.orig/include/linux/acpi.h +++ linux-next-20110112/include/linux/acpi.h @@ -360,5 +360,10 @@ static inline int acpi_table_parse(char { return -1; } + +static inline int suspend_nvs_register(unsigned long a, unsigned long b) +{ + return 0; +} #endif /* !CONFIG_ACPI */ #endif /*_LINUX_ACPI_H*/