summaryrefslogtreecommitdiff
path: root/arch/ia64/Kconfig
diff options
context:
space:
mode:
authorHerbert Xu <herbert@gondor.apana.org.au>2010-05-26 01:36:58 (GMT)
committerHerbert Xu <herbert@gondor.apana.org.au>2010-05-26 01:36:58 (GMT)
commit50d1e9302bab7d35dae7146f8c468e0943015616 (patch)
treefa05320f4a297bd582686574cf94ba444e264b3f /arch/ia64/Kconfig
parent7cc2835083aedfde42de02301005a5555e00c4b1 (diff)
parentdc4ccfd15d4fc7a91ddf222bc5eed5cc4bcf10e6 (diff)
downloadlinux-fsl-qoriq-50d1e9302bab7d35dae7146f8c468e0943015616.tar.xz
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/crypto-2.6
Diffstat (limited to 'arch/ia64/Kconfig')
-rw-r--r--arch/ia64/Kconfig3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 4d4f418..9676100 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -59,9 +59,6 @@ config NEED_DMA_MAP_STATE
config SWIOTLB
bool
-config IOMMU_HELPER
- bool
-
config GENERIC_LOCKBREAK
def_bool n