---

yaml --- r: 220932 b: refs/heads/master c: 3414df8 h: refs/heads/master v: v3
git-mirror · Oct 29, 2010 · 6774abc · 6774abc
1 parent 0fa0857
commit 6774abc
Show file tree

Hide file tree

Showing 100 changed files with 15 additions and 39,893 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12462f2df4d10ea4f6d55b9d438ff788badec3f0
+refs/heads/master: 3414df8ca38b203c8a5ad8efc32d4a3836a0596d
diff --git a/trunk/drivers/dma/Kconfig b/trunk/drivers/dma/Kconfig
@@ -200,11 +200,11 @@ config PL330_DMA
 	  platform_data for a dma-pl330 device.
 
 config PCH_DMA
-	tristate "Topcliff (Intel EG20T) PCH DMA support"
+	tristate "Topcliff PCH DMA support"
 	depends on PCI && X86
 	select DMA_ENGINE
 	help
-	  Enable support for the Topcliff (Intel EG20T) PCH DMA engine.
+	  Enable support for the Topcliff PCH DMA engine.
 
 config IMX_SDMA
 	tristate "i.MX SDMA support"

diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -87,8 +87,6 @@ source "drivers/staging/rtl8712/Kconfig"
 
 source "drivers/staging/frontier/Kconfig"
 
-source "drivers/staging/dream/Kconfig"
-
 source "drivers/staging/pohmelfs/Kconfig"
 
 source "drivers/staging/autofs/Kconfig"

diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -28,7 +28,6 @@ obj-$(CONFIG_RTL8192E)		+= rtl8192e/
 obj-$(CONFIG_R8712U)		+= rtl8712/
 obj-$(CONFIG_SPECTRA)		+= spectra/
 obj-$(CONFIG_TRANZPORT)		+= frontier/
-obj-$(CONFIG_DREAM)		+= dream/
 obj-$(CONFIG_POHMELFS)		+= pohmelfs/
 obj-$(CONFIG_AUTOFS_FS)		+= autofs/
 obj-$(CONFIG_IDE_PHISON)	+= phison/

diff --git a/trunk/drivers/staging/dream/Kconfig b/trunk/drivers/staging/dream/Kconfig
diff --git a/trunk/drivers/staging/dream/Makefile b/trunk/drivers/staging/dream/Makefile
diff --git a/trunk/drivers/staging/dream/TODO b/trunk/drivers/staging/dream/TODO
diff --git a/trunk/drivers/staging/dream/camera/Kconfig b/trunk/drivers/staging/dream/camera/Kconfig
diff --git a/trunk/drivers/staging/dream/camera/Makefile b/trunk/drivers/staging/dream/camera/Makefile