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

Commit f341dddf authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Staging: merge staging patches into Linus's main branch 



There were a number of patches that went into Linus's
tree already that conflicted with other changes in the
staging branch.  This merge resolves those merge conflicts.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parents eaa5eec7 b02957d5

drivers/staging/Kconfig

+5 −9
Original line number Diff line number Diff line
@@ -71,8 +71,6 @@ source "drivers/staging/asus_oled/Kconfig" 


source "drivers/staging/panel/Kconfig"



source "drivers/staging/altpciechdma/Kconfig"



source "drivers/staging/rtl8187se/Kconfig"



source "drivers/staging/rtl8192su/Kconfig"
@@ -81,20 +79,14 @@ source "drivers/staging/rtl8192u/Kconfig" 


source "drivers/staging/rtl8192e/Kconfig"



source "drivers/staging/mimio/Kconfig"



source "drivers/staging/frontier/Kconfig"



source "drivers/staging/dream/Kconfig"



source "drivers/staging/pohmelfs/Kconfig"



source "drivers/staging/b3dfg/Kconfig"



source "drivers/staging/phison/Kconfig"



source "drivers/staging/p9auth/Kconfig"



source "drivers/staging/line6/Kconfig"



source "drivers/gpu/drm/vmwgfx/Kconfig"
@@ -117,7 +109,7 @@ source "drivers/staging/hv/Kconfig" 


source "drivers/staging/vme/Kconfig"



source "drivers/staging/rar/Kconfig"

source "drivers/staging/rar_register/Kconfig"



source "drivers/staging/sep/Kconfig"
@@ -143,5 +135,9 @@ source "drivers/staging/netwave/Kconfig" 


source "drivers/staging/sm7xx/Kconfig"



source "drivers/staging/dt3155/Kconfig"



source "drivers/staging/crystalhd/Kconfig"



endif # !STAGING_EXCLUDE_BUILD

endif # STAGING

drivers/staging/Makefile

+3 −5
Original line number Diff line number Diff line
@@ -18,18 +18,14 @@ obj-$(CONFIG_RT2870) += rt2870/ 
obj-$(CONFIG_COMEDI)		+= comedi/

obj-$(CONFIG_ASUS_OLED)		+= asus_oled/

obj-$(CONFIG_PANEL)		+= panel/

obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma/

obj-$(CONFIG_R8187SE)		+= rtl8187se/

obj-$(CONFIG_RTL8192SU)		+= rtl8192su/

obj-$(CONFIG_RTL8192U)		+= rtl8192u/

obj-$(CONFIG_RTL8192E)		+= rtl8192e/

obj-$(CONFIG_INPUT_MIMIO)	+= mimio/

obj-$(CONFIG_TRANZPORT)		+= frontier/

obj-$(CONFIG_DREAM)		+= dream/

obj-$(CONFIG_POHMELFS)		+= pohmelfs/

obj-$(CONFIG_B3DFG)		+= b3dfg/

obj-$(CONFIG_IDE_PHISON)	+= phison/

obj-$(CONFIG_PLAN9AUTH)		+= p9auth/

obj-$(CONFIG_LINE6_USB)		+= line6/

obj-$(CONFIG_USB_SERIAL_QUATECH2)	+= serqt_usb2/

obj-$(CONFIG_USB_SERIAL_QUATECH_USB2)	+= quatech_usb2/
@@ -39,7 +35,7 @@ obj-$(CONFIG_VT6656) += vt6656/ 
obj-$(CONFIG_FB_UDL)		+= udlfb/

obj-$(CONFIG_HYPERV)		+= hv/

obj-$(CONFIG_VME_BUS)		+= vme/

obj-$(CONFIG_RAR_REGISTER)	+= rar/

obj-$(CONFIG_RAR_REGISTER)	+= rar_register/

obj-$(CONFIG_DX_SEP)		+= sep/

obj-$(CONFIG_IIO)		+= iio/

obj-$(CONFIG_RAMZSWAP)		+= ramzswap/
@@ -53,3 +49,5 @@ obj-$(CONFIG_WAVELAN) += wavelan/ 
obj-$(CONFIG_PCMCIA_WAVELAN)	+= wavelan/

obj-$(CONFIG_PCMCIA_NETWAVE)	+= netwave/

obj-$(CONFIG_FB_SM7XX)		+= sm7xx/

obj-$(CONFIG_DT3155)		+= dt3155/

obj-$(CONFIG_CRYSTALHD)		+= crystalhd/

drivers/staging/altpciechdma/Kconfig

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
config ALTERA_PCIE_CHDMA

	tristate "Altera PCI Express Chaining DMA driver"

	depends on PCI

	default N

	---help---

	  A reference driver that exercises the Chaining DMA logic reference

	  design generated along the Altera FPGA PCI Express soft or hard core,

	  only if instantiated using the MegaWizard, not the SOPC builder, of

	  Quartus 8.1.

drivers/staging/altpciechdma/Makefile

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
obj-$(CONFIG_ALTERA_PCIE_CHDMA)	+= altpciechdma.o

drivers/staging/altpciechdma/TODO

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
DONE:

    - functionality similar to logic testbench



TODO:

	- checkpatch.pl cleanups.

	- keep state of DMA engines.

	- keep data structure that keeps state of each transfer.

	- interrupt handler should iterate over outstanding descriptor tables.

	- complete userspace cdev to read/write using the DMA engines.

	- split off the DMA support functions in a module, re-usable by custom

	  drivers.



Please coordinate work with, and send patches to

Leon Woestenberg <leon@sidebranch.com>