Merge branch 'apei-release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb...

[~shefty/rdma-dev.git] / include / linux / acpi.h

diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index e19527de6a93c3a5a089cb2a02c7d0c4a4ec54b4..6001b4da39ddc9ebd52e0f7691268abbe8ebb69d 100644 (file)
--- a/include/linux/acpi.h
+++ b/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)
 extern int pnpacpi_disabled;
 
 #define PXM_INVAL      (-1)

-#define NID_INVAL      (-1)

 
 int acpi_check_resource_conflict(const struct resource *res);
 
 
 int acpi_check_resource_conflict(const struct resource *res);