diff options
author | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
---|---|---|
committer | Len Brown <len.brown@intel.com> | 2008-11-11 21:14:11 -0500 |
commit | 3e0fe364835cecc8560cf32bb9609f4c56c5d9fa (patch) | |
tree | be2236bd4f6f16aee24cca5217449dc03a6c1e85 /drivers/acpi/acpi_memhotplug.c | |
parent | e911d27af43e7d28d59a96a4682e8942f0661469 (diff) | |
parent | 32836259ff25ce97010569706cd33ba94de81d62 (diff) |
Merge branch 'misc' into release
Diffstat (limited to 'drivers/acpi/acpi_memhotplug.c')
-rw-r--r-- | drivers/acpi/acpi_memhotplug.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/acpi/acpi_memhotplug.c b/drivers/acpi/acpi_memhotplug.c index 71d21c51c45..63a17b55b39 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c @@ -32,7 +32,6 @@ #include <linux/memory_hotplug.h> #include <acpi/acpi_drivers.h> -#define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000UL #define ACPI_MEMORY_DEVICE_CLASS "memory" #define ACPI_MEMORY_DEVICE_HID "PNP0C80" #define ACPI_MEMORY_DEVICE_NAME "Hotplug Mem Device" |