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

[linux-2.6] / include / acpi / actbl1.h

diff --git a/include/acpi/actbl1.h b/include/acpi/actbl1.h
index 3156d1ab61fe1b2ae12c53f8e5c8cacc6e1e1bf8..4e5d3ca53a8eb15d6ae209d187f15404a7edf0bc 100644 (file)
--- a/include/acpi/actbl1.h
+++ b/include/acpi/actbl1.h
@@ -5,7 +5,7 @@
  *****************************************************************************/
 
 /*
- * Copyright (C) 2000 - 2006, R. Byron Moore
+ * Copyright (C) 2000 - 2007, R. Byron Moore
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -669,16 +669,6 @@ struct acpi_srat_mem_affinity {
 #define ACPI_SRAT_MEM_HOT_PLUGGABLE (1<<1)     /* 01: Memory region is hot pluggable */
 #define ACPI_SRAT_MEM_NON_VOLATILE  (1<<2)     /* 02: Memory region is non-volatile */
 
-/* Memory types */
-
-enum acpi_address_range_id {
-       ACPI_ADDRESS_RANGE_MEMORY = 1,
-       ACPI_ADDRESS_RANGE_RESERVED = 2,
-       ACPI_ADDRESS_RANGE_ACPI = 3,
-       ACPI_ADDRESS_RANGE_NVS = 4,
-       ACPI_ADDRESS_RANGE_COUNT = 5
-};
-
 /*******************************************************************************
  *
  * TCPA - Trusted Computing Platform Alliance table