Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d56f84e7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 12462f2d 3414df8c

drivers/staging/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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"

drivers/staging/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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/

drivers/staging/dream/Kconfig

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
config DREAM

	tristate "HTC Dream support"

	depends on MACH_TROUT



if DREAM



source "drivers/staging/dream/camera/Kconfig"



config INPUT_GPIO

	tristate "GPIO driver support"

	help

	  Say Y here if you want to support gpio based keys, wheels etc...

endif

drivers/staging/dream/Makefile

deleted100644 → 0
+0 −5
Original line number Diff line number Diff line 
ccflags-y:=-Idrivers/staging/dream/include

obj-$(CONFIG_MSM_ADSP)		+= qdsp5/

obj-$(CONFIG_MSM_CAMERA)	+= camera/

obj-$(CONFIG_INPUT_GPIO)	+= gpio_axis.o gpio_event.o gpio_input.o gpio_matrix.o gpio_output.o

drivers/staging/dream/TODO

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 


* camera driver uses old V4L API



* coding style in some places is lacking



* gpio_input.c has some features matrix_keypad lacks. They should be

merged to gpio_input, with gpio_input.c removed



* pmem provides interface for userspace. Needs to be reviewed at least.



* it is probably possible to simplify touchscreen driver using threaded_irq's.



* touchscreen driver should be switched to oficial multitouch API