diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-08 15:58:08 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2014-08-08 15:58:08 +1000 |
| commit | 9028bb948d3c3a5bfd5c4c66854a34f9a0d3c59d (patch) | |
| tree | 079104f6c3faf0491053b290dda175d646e4d049 /arch/ia64/Kconfig | |
| parent | e428f54e841d36f97652eedf7a074e716b082e28 (diff) | |
| parent | 929c76e4e6292770322822a50e08b8feaa4afbbf (diff) | |
Merge branch 'akpm-current/current'
Conflicts:
arch/arm64/Kconfig
drivers/rapidio/devices/tsi721_dma.c
include/linux/glob.h
kernel/acct.c
kernel/kexec.c
mm/huge_memory.c
mm/memcontrol.c
mm/memory.c
mm/oom_kill.c
net/batman-adv/fragmentation.c
Diffstat (limited to 'arch/ia64/Kconfig')
| -rw-r--r-- | arch/ia64/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig index 44a6915ab13d..c84c88bbbbd7 100644 --- a/arch/ia64/Kconfig +++ b/arch/ia64/Kconfig @@ -28,6 +28,7 @@ config IA64 select HAVE_MEMBLOCK select HAVE_MEMBLOCK_NODE_MAP select HAVE_VIRT_CPU_ACCOUNTING + select ARCH_HAS_SG_CHAIN select VIRT_TO_BUS select ARCH_DISCARD_MEMBLOCK select GENERIC_IRQ_PROBE |