projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
[firefly-linux-kernel-4.4.55.git]
/
arch
/
ia64
/
Kconfig
diff --git
a/arch/ia64/Kconfig
b/arch/ia64/Kconfig
index c90366ef718389521c0387405cb3c6f772c07afd..33f3fdc0b214e93350b95d8ec8fcc935df2b56d9 100644
(file)
--- a/
arch/ia64/Kconfig
+++ b/
arch/ia64/Kconfig
@@
-26,6
+26,7
@@
config IA64
select HAVE_MEMBLOCK
select HAVE_MEMBLOCK_NODE_MAP
select HAVE_VIRT_CPU_ACCOUNTING
+ select HAVE_VIRT_TO_BUS
select ARCH_DISCARD_MEMBLOCK
select GENERIC_IRQ_PROBE
select GENERIC_PENDING_IRQ if SMP