diff options
| author | James Morris <jmorris@namei.org> | 2008-11-13 19:29:12 -0500 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-13 19:29:12 -0500 |
| commit | 2b828925652340277a889cbc11b2d0637f7cdaf7 (patch) | |
| tree | 32fcb3d3e466fc419fad2d3717956a5b5ad3d35a /drivers/acpi/acpi_memhotplug.c | |
| parent | 3a3b7ce9336952ea7b9564d976d068a238976c9d (diff) | |
| parent | 58e20d8d344b0ee083febb18c2b021d2427e56ca (diff) | |
Merge branch 'master' into next
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by: James Morris <jmorris@namei.org>
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 71d21c51c45f..63a17b55b39b 100644 --- a/drivers/acpi/acpi_memhotplug.c +++ b/drivers/acpi/acpi_memhotplug.c | |||
| @@ -32,7 +32,6 @@ | |||
| 32 | #include <linux/memory_hotplug.h> | 32 | #include <linux/memory_hotplug.h> |
| 33 | #include <acpi/acpi_drivers.h> | 33 | #include <acpi/acpi_drivers.h> |
| 34 | 34 | ||
| 35 | #define ACPI_MEMORY_DEVICE_COMPONENT 0x08000000UL | ||
| 36 | #define ACPI_MEMORY_DEVICE_CLASS "memory" | 35 | #define ACPI_MEMORY_DEVICE_CLASS "memory" |
| 37 | #define ACPI_MEMORY_DEVICE_HID "PNP0C80" | 36 | #define ACPI_MEMORY_DEVICE_HID "PNP0C80" |
| 38 | #define ACPI_MEMORY_DEVICE_NAME "Hotplug Mem Device" | 37 | #define ACPI_MEMORY_DEVICE_NAME "Hotplug Mem Device" |