X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=arch%2Fpowerpc%2FKconfig;h=2e19500921f9fbdc33f40321ae34f648171faba0;hb=96e35b40c0d6206f56370f937f6f4722739eb273;hp=8a54eb8e37683d8ec1de947ccb51f3abf7672060;hpb=01da47059ab54544a508b217598fb0e73b73e7a8;p=android-x86%2Fkernel.git

diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 8a54eb8e3768..2e19500921f9 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -313,19 +313,6 @@ config 8XX_MINIMAL_FPEMU
 
 	  It is recommended that you build a soft-float userspace instead.
 
-config IOMMU_VMERGE
-	bool "Enable IOMMU virtual merging"
-	depends on PPC64
-	default y
-	help
-	  Cause IO segments sent to a device for DMA to be merged virtually
-	  by the IOMMU when they happen to have been allocated contiguously.
-	  This doesn't add pressure to the IOMMU allocator. However, some
-	  drivers don't support getting large merged segments coming back
-	  from *_map_sg().
-
-	  Most drivers don't have this problem; it is safe to say Y here.
-
 config IOMMU_HELPER
 	def_bool PPC64