---

yaml --- r: 45163 b: refs/heads/master c: 36f696c h: refs/heads/master i: 45161: 9ba69eb 45159: 2b15587 v: v3
git-mirror · Jan 1, 2007 · 4f6e7ab · 4f6e7ab
1 parent f80086c
commit 4f6e7ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 669df1b478803f49a356528d290af7bf442eb3be
+refs/heads/master: 36f696cd7ffc82c48bf5826bbb4e005370fb9c6a
diff --git a/trunk/arch/x86_64/Kconfig b/trunk/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