diff options
| author | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2006-06-29 19:57:46 -0400 |
| commit | d120cfb544ed6161b9d32fb6c4648c471807ee6b (patch) | |
| tree | 7757ad0198d8df76ff5c60f939a687687c41da00 /drivers/acpi/Kconfig | |
| parent | 9dce0e950dbfab4148f35ac6f297d8638cdc63c4 (diff) | |
| parent | bf7e8511088963078484132636839b59e25cf14f (diff) | |
merge linus into release branch
Conflicts:
drivers/acpi/acpi_memhotplug.c
Diffstat (limited to 'drivers/acpi/Kconfig')
| -rw-r--r-- | drivers/acpi/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig index ce15aed1df3f..bc2652d72fdc 100644 --- a/drivers/acpi/Kconfig +++ b/drivers/acpi/Kconfig | |||
| @@ -335,7 +335,7 @@ config ACPI_CONTAINER | |||
| 335 | config ACPI_HOTPLUG_MEMORY | 335 | config ACPI_HOTPLUG_MEMORY |
| 336 | tristate "Memory Hotplug" | 336 | tristate "Memory Hotplug" |
| 337 | depends on ACPI | 337 | depends on ACPI |
| 338 | depends on MEMORY_HOTPLUG || X86_64 | 338 | depends on MEMORY_HOTPLUG |
| 339 | default n | 339 | default n |
| 340 | help | 340 | help |
| 341 | This driver adds supports for ACPI Memory Hotplug. This driver | 341 | This driver adds supports for ACPI Memory Hotplug. This driver |