---

yaml --- r: 212071 b: refs/heads/master c: 66f2b06 h: refs/heads/master i: 212069: 01dbbf4 212067: f4c1195 212063: 7da5ab0 v: v3
git-mirror · Oct 20, 2010 · 85b8c02 · 85b8c02
1 parent 63cea93
commit 85b8c02
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 932967202182743c01a2eee4bdfa2c42697bc586
+refs/heads/master: 66f2b061546974b96b7b238a92ce89a87ecf0754
diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
@@ -1148,6 +1148,9 @@ config X86_PAE
 config ARCH_PHYS_ADDR_T_64BIT
 	def_bool X86_64 || X86_PAE
 
+config ARCH_DMA_ADDR_T_64BIT
+	def_bool X86_64 || HIGHMEM64G
+
 config DIRECT_GBPAGES
 	bool "Enable 1GB pages for kernel pagetables" if EMBEDDED
 	default y