From patchwork Thu Jul 28 20:48:43 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Morton X-Patchwork-Id: 1017732 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p6SKmlRx013408 for ; Thu, 28 Jul 2011 20:48:48 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755038Ab1G1Usq (ORCPT ); Thu, 28 Jul 2011 16:48:46 -0400 Received: from smtp1.linux-foundation.org ([140.211.169.13]:60650 "EHLO smtp1.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754757Ab1G1Usq (ORCPT ); Thu, 28 Jul 2011 16:48:46 -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 p6SKmhDS025580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 28 Jul 2011 13:48:43 -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 p6SKmhxp007588; Thu, 28 Jul 2011 13:48:43 -0700 Message-Id: <201107282048.p6SKmhxp007588@imap1.linux-foundation.org> Subject: [patch 4/5] acpi: remove NID_INVAL To: lenb@kernel.org Cc: linux-acpi@vger.kernel.org, akpm@linux-foundation.org, rientjes@google.com From: akpm@linux-foundation.org Date: Thu, 28 Jul 2011 13:48:43 -0700 MIME-Version: 1.0 X-Spam-Status: No, hits=-103.474 required=5 tests=AWL, BAYES_00, OSDL_HEADER_SUBJECT_BRACKETED, USER_IN_WHITELIST 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 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Thu, 28 Jul 2011 20:48:49 +0000 (UTC) From: David Rientjes b552a8c56db8 ("ACPI: remove NID_INVAL") removed the left over uses of NID_INVAL, but didn't actually remove the definition. Remove it. Signed-off-by: David Rientjes Cc: Len Brown Signed-off-by: Andrew Morton --- include/linux/acpi.h | 1 - 1 file changed, 1 deletion(-) diff -puN include/linux/acpi.h~acpi-remove-nid_inval include/linux/acpi.h --- a/include/linux/acpi.h~acpi-remove-nid_inval +++ a/include/linux/acpi.h @@ -238,7 +238,6 @@ extern int acpi_paddr_to_node(u64 start_ extern int pnpacpi_disabled; #define PXM_INVAL (-1) -#define NID_INVAL (-1) int acpi_check_resource_conflict(const struct resource *res);