---

yaml --- r: 149688 b: refs/heads/master c: 27db1fe h: refs/heads/master v: v3
git-mirror · Jun 3, 2009 · ed11d97 · ed11d97
1 parent 7c36238
commit ed11d97
Show file tree

Hide file tree

Showing 66 changed files with 1,508 additions and 2,497 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ec3cf2ece22a8ede7478bf38e2a818986322662b
+refs/heads/master: 27db1fea1868ee346fe5a2fba00eb8fc69283f2c
diff --git a/trunk/arch/powerpc/Kconfig b/trunk/arch/powerpc/Kconfig
@@ -300,19 +300,9 @@ config IOMMU_VMERGE
 config IOMMU_HELPER
 	def_bool PPC64
 
-config SWIOTLB
-	bool "SWIOTLB support"
-	default n
-	select IOMMU_HELPER
-	---help---
-	  Support for IO bounce buffering for systems without an IOMMU.
-	  This allows us to DMA to the full physical address space on
-	  platforms where the size of a physical address is larger
-	  than the bus address.  Not all platforms support this.
-
 config PPC_NEED_DMA_SYNC_OPS
 	def_bool y
-	depends on (NOT_COHERENT_CACHE || SWIOTLB)
+	depends on NOT_COHERENT_CACHE
 
 config HOTPLUG_CPU
 	bool "Support for enabling/disabling CPUs"

diff --git a/trunk/arch/powerpc/Makefile b/trunk/arch/powerpc/Makefile
@@ -142,7 +142,6 @@ head-$(CONFIG_FSL_BOOKE)	:= arch/powerpc/kernel/head_fsl_booke.o
 
 head-$(CONFIG_PPC64)		+= arch/powerpc/kernel/entry_64.o
 head-$(CONFIG_PPC_FPU)		+= arch/powerpc/kernel/fpu.o
-head-$(CONFIG_ALTIVEC)		+= arch/powerpc/kernel/vector.o
 
 core-y				+= arch/powerpc/kernel/ \
 				   arch/powerpc/mm/ \