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

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

Staging: meilhaus: remove the drivers 



The comedi drivers should be used instead, no need to have
these in here as well.

Cc: David Kiliani <mail@davidkiliani.de>
Cc: Meilhaus Support <support@meilhaus.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 06bf27dd

drivers/staging/Kconfig

+0 −2
Original line number Original line Diff line number Diff line
@@ -47,8 +47,6 @@ source "drivers/staging/slicoss/Kconfig" 




source "drivers/staging/sxg/Kconfig"

source "drivers/staging/sxg/Kconfig"





source "drivers/staging/meilhaus/Kconfig"



source "drivers/staging/go7007/Kconfig"

source "drivers/staging/go7007/Kconfig"





source "drivers/staging/usbip/Kconfig"

source "drivers/staging/usbip/Kconfig"

drivers/staging/Makefile

+0 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,6 @@ obj-$(CONFIG_STAGING) += staging.o 
obj-$(CONFIG_ET131X)		+= et131x/

obj-$(CONFIG_ET131X)		+= et131x/

obj-$(CONFIG_SLICOSS)		+= slicoss/

obj-$(CONFIG_SLICOSS)		+= slicoss/

obj-$(CONFIG_SXG)		+= sxg/

obj-$(CONFIG_SXG)		+= sxg/

obj-$(CONFIG_MEILHAUS)		+= meilhaus/

obj-$(CONFIG_VIDEO_GO7007)	+= go7007/

obj-$(CONFIG_VIDEO_GO7007)	+= go7007/

obj-$(CONFIG_USB_IP_COMMON)	+= usbip/

obj-$(CONFIG_USB_IP_COMMON)	+= usbip/

obj-$(CONFIG_W35UND)		+= winbond/

obj-$(CONFIG_W35UND)		+= winbond/

drivers/staging/meilhaus/Kconfig

deleted100644 → 0
+0 −128
Original line number Original line Diff line number Diff line 
#

# Meilhaus configuration

#



menuconfig MEILHAUS

	tristate "Meilhaus support"

	depends on m

	---help---

	  If you have a Meilhaus card, say Y (or M) here.



	  You need both this driver, and the driver for the particular

	  data collection card.



	  To compile this driver as a module, choose M here. The module will

	  be called memain.



if MEILHAUS



config ME0600

	tristate "Meilhaus ME-600 support"

	default n

	depends on PCI && m

	help

	  This driver supports the Meilhaus ME-600 family of boards

	  that do data collection and multipurpose I/O.



	  To compile this driver as a module, choose M here: the module

	  will be called me0600.



config ME0900

	tristate "Meilhaus ME-900 support"

	default n

	depends on PCI && m

	help

	  This driver supports the Meilhaus ME-900 family of boards

	  that do data collection and multipurpose I/O.



	  To compile this driver as a module, choose M here: the module

	  will be called me0900.



config ME1000

	tristate "Meilhaus ME-1000 support"

	default n

	depends on PCI && m

	help

	  This driver supports the Meilhaus ME-1000 family of boards

	  that do data collection and multipurpose I/O.



	  To compile this driver as a module, choose M here: the module

	  will be called me1000.



config ME1400

	tristate "Meilhaus ME-1400 support"

	default n

	depends on PCI && m

	help

	  This driver supports the Meilhaus ME-1400 family of boards

	  that do data collection and multipurpose I/O.



	  To compile this driver as a module, choose M here: the module

	  will be called me1400.



config ME1600

	tristate "Meilhaus ME-1600 support"

	default n

	depends on PCI && m

	help

	  This driver supports the Meilhaus ME-1600 family of boards

	  that do data collection and multipurpose I/O.



	  To compile this driver as a module, choose M here: the module

	  will be called me1600.



config ME4600

	tristate "Meilhaus ME-4600 support"

	default n

	depends on PCI && m

	help

	  This driver supports the Meilhaus ME-4600 family of boards

	  that do data collection and multipurpose I/O.



	  To compile this driver as a module, choose M here: the module

	  will be called me4600.



config ME6000

	tristate "Meilhaus ME-6000 support"

	default n

	depends on PCI && m

	help

	  This driver supports the Meilhaus ME-6000 family of boards

	  that do data collection and multipurpose I/O.



	  To compile this driver as a module, choose M here: the module

	  will be called me6000.



config ME8100

	tristate "Meilhaus ME-8100 support"

	default n

	depends on PCI && m

	help

	  This driver supports the Meilhaus ME-8100 family of boards

	  that do data collection and multipurpose I/O.



	  To compile this driver as a module, choose M here: the module

	  will be called me8100.



config ME8200

	tristate "Meilhaus ME-8200 support"

	default n

	depends on PCI && m

	help

	  This driver supports the Meilhaus ME-8200 family of boards

	  that do data collection and multipurpose I/O.



	  To compile this driver as a module, choose M here: the module

	  will be called me8200.



config MEDUMMY

	tristate "Meilhaus dummy driver"

	default n

	depends on PCI && m

	help

	  This provides a dummy driver for the Meilhaus driver package



	  To compile this driver as a module, choose M here: the module

	  will be called medummy.



endif # MEILHAUS

drivers/staging/meilhaus/Makefile

deleted100644 → 0
+0 −43
Original line number Original line Diff line number Diff line 
#

# Makefile for Meilhaus linux driver system

#



obj-$(CONFIG_MEILHAUS) += memain.o

obj-$(CONFIG_ME1600) += me1600.o

obj-$(CONFIG_ME1000) += me1000.o

obj-$(CONFIG_ME1400) += me1400.o

obj-$(CONFIG_ME4600) += me4600.o

obj-$(CONFIG_ME6000) += me6000.o

obj-$(CONFIG_ME0600) += me0600.o

obj-$(CONFIG_ME8100) += me8100.o

obj-$(CONFIG_ME8200) += me8200.o

obj-$(CONFIG_ME0900) += me0900.o

obj-$(CONFIG_MEDUMMY) += medummy.o





me1600-objs := medevice.o medlist.o medlock.o me1600_device.o

me1600-objs += mesubdevice.o meslist.o meslock.o me1600_ao.o



me1000-objs := medevice.o medlist.o medlock.o me1000_device.o

me1000-objs += mesubdevice.o meslist.o meslock.o me1000_dio.o



me1400-objs := medevice.o medlist.o medlock.o me1400_device.o

me1400-objs += mesubdevice.o meslist.o meslock.o me8254.o me8255.o me1400_ext_irq.o



me4600-objs := medevice.o medlist.o medlock.o mefirmware.o me4600_device.o

me4600-objs += mesubdevice.o meslist.o meslock.o me4600_do.o me4600_di.o me4600_dio.o me8254.o me4600_ai.o me4600_ao.o me4600_ext_irq.o



me6000-objs := medevice.o medlist.o medlock.o mefirmware.o me6000_device.o

me6000-objs += mesubdevice.o meslist.o meslock.o me6000_dio.o me6000_ao.o



me0600-objs := medevice.o medlist.o medlock.o me0600_device.o

me0600-objs += mesubdevice.o meslist.o meslock.o me0600_relay.o me0600_ttli.o me0600_optoi.o me0600_dio.o me0600_ext_irq.o



me8100-objs := medevice.o medlist.o medlock.o me8100_device.o

me8100-objs += mesubdevice.o meslist.o meslock.o me8100_di.o me8100_do.o me8254.o



me8200-objs := medevice.o medlist.o medlock.o me8200_device.o

me8200-objs += mesubdevice.o meslist.o meslock.o me8200_di.o me8200_do.o me8200_dio.o



me0900-objs := medevice.o medlist.o medlock.o me0900_device.o

me0900-objs += mesubdevice.o meslist.o meslock.o me0900_do.o me0900_di.o

drivers/staging/meilhaus/TODO

deleted100644 → 0
+0 −10
Original line number Original line Diff line number Diff line 
TODO:

	- checkpatch.pl cleanups

	- sparse issues

	- Lindent

	- audit userspace interface

	- handle firmware properly

	- possible comedi merge



Please send cleanup patches to Greg Kroah-Hartman <greg@kroah.com>

and CC: David Kiliani <mail@davidkiliani.de> and Meilhaus Support <support@meilhaus.de>