git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Pull Kconfig into release branch
[sfrench/cifs-2.6.git]
/
arch
/
ia64
/
Kconfig
diff --git
a/arch/ia64/Kconfig
b/arch/ia64/Kconfig
index 0f3076a820c3af7dd7c71790be13e212354b3e1a..f0252eda12a8e08f0c6682e89ff796238e8f7739 100644
(file)
--- a/
arch/ia64/Kconfig
+++ b/
arch/ia64/Kconfig
@@
-77,6
+77,7
@@
choice
config IA64_GENERIC
bool "generic"
select ACPI
+ select PCI
select NUMA
select ACPI_NUMA
help