Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6: Staging: dream: remove dream driver and arch from tree
git-mirror · Oct 29, 2010 · d56f84e · d56f84e
2 parents 12462f2 + 3414df8
commit d56f84e
Show file tree

Hide file tree

Showing 93 changed files with 0 additions and 39,835 deletions.
diff --git a/drivers/staging/Kconfig b/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/drivers/staging/Makefile b/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/drivers/staging/dream/Kconfig b/drivers/staging/dream/Kconfig
diff --git a/drivers/staging/dream/Makefile b/drivers/staging/dream/Makefile
diff --git a/drivers/staging/dream/TODO b/drivers/staging/dream/TODO
diff --git a/drivers/staging/dream/camera/Kconfig b/drivers/staging/dream/camera/Kconfig
diff --git a/drivers/staging/dream/camera/Makefile b/drivers/staging/dream/camera/Makefile