Revert "[PATCH] x86_64: fix boot hang caused by CALGARY_IOMMU_ENABLED…

…_BY_DEFAULT"

This reverts commit a9622f6.  Now that
the Calgary code apparently detects itself properly, it's not needed any
more.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>

arch/x86_64/Kconfig

@@ -480,13 +480,14 @@ config CALGARY_IOMMU
 
 config CALGARY_IOMMU_ENABLED_BY_DEFAULT
 	bool "Should Calgary be enabled by default?"
+	default y
 	depends on CALGARY_IOMMU
 	help
-	  Should Calgary be enabled by default? If you choose 'y', Calgary
+	  Should Calgary be enabled by default? if you choose 'y', Calgary
 	  will be used (if it exists). If you choose 'n', Calgary will not be
 	  used even if it exists. If you choose 'n' and would like to use
 	  Calgary anyway, pass 'iommu=calgary' on the kernel command line.
-	  If unsure, say N.
+	  If unsure, say Y.
 
 # need this always selected by IOMMU for the VIA workaround
 config SWIOTLB