git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branches 'release', 'asus', 'sony-laptop' and 'thinkpad' into release
[pandora-kernel.git]
/
arch
/
powerpc
/
Kconfig
diff --git
a/arch/powerpc/Kconfig
b/arch/powerpc/Kconfig
index
b94d450
..
cf030b0
100644
(file)
--- a/
arch/powerpc/Kconfig
+++ b/
arch/powerpc/Kconfig
@@
-256,6
+256,9
@@
config IOMMU_VMERGE
Most drivers don't have this problem; it is safe to say Y here.
+config IOMMU_HELPER
+ def_bool PPC64
+
config HOTPLUG_CPU
bool "Support for enabling/disabling CPUs"
depends on SMP && HOTPLUG && EXPERIMENTAL && (PPC_PSERIES || PPC_PMAC)