From 383f55f316230db9093cfd2a7c8d07c09fda19b0 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Thu, 28 Jul 2011 13:48:43 -0700
Subject: [PATCH] --- yaml --- r: 262286 b: refs/heads/master c:
 f52e00c668669c9c290e84adf859c76db6d92a5a h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/include/linux/acpi.h | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 71f7fe47be59..e9cd7a216aa9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 31f5396ad3bde23c8416e8d23ba425e27f413314
+refs/heads/master: f52e00c668669c9c290e84adf859c76db6d92a5a
diff --git a/trunk/include/linux/acpi.h b/trunk/include/linux/acpi.h
index 1deb2a73c2da..2312e850aab8 100644
--- a/trunk/include/linux/acpi.h
+++ b/trunk/include/linux/acpi.h
@@ -238,7 +238,6 @@ extern int acpi_paddr_to_node(u64 start_addr, u64 size);
 extern int pnpacpi_disabled;
 
 #define PXM_INVAL	(-1)
-#define NID_INVAL	(-1)
 
 int acpi_check_resource_conflict(const struct resource *res);