projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
[powerpc.git]
/
drivers
/
acpi
/
Kconfig
diff --git
a/drivers/acpi/Kconfig
b/drivers/acpi/Kconfig
index
5cb9630
..
c24652d
100644
(file)
--- a/
drivers/acpi/Kconfig
+++ b/
drivers/acpi/Kconfig
@@
-329,7
+329,7
@@
config ACPI_CONTAINER
config ACPI_HOTPLUG_MEMORY
tristate "Memory Hotplug"
depends on ACPI
- depends on MEMORY_HOTPLUG
+ depends on MEMORY_HOTPLUG
|| X86_64
default n
help
This driver adds supports for ACPI Memory Hotplug. This driver