---

yaml --- r: 115557 b: refs/heads/master c: c0f0058 h: refs/heads/master i: 115555: b5d9839 v: v3
git-mirror · Oct 10, 2008 · 2a3de31 · 2a3de31
1 parent 1bf6daf
commit 2a3de31
Show file tree

Hide file tree

Showing 8 changed files with 7,115 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cff338a9bd9d1acd6067d3ec93e846830e0b5974
+refs/heads/master: c0f005888c6663898a040cd922947dd8caa55160
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -29,4 +29,6 @@ source "drivers/staging/slicoss/Kconfig"
 
 source "drivers/staging/sxg/Kconfig"
 
+source "drivers/staging/me4000/Kconfig"
+
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -3,3 +3,4 @@
 obj-$(CONFIG_ET131X)		+= et131x/
 obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_SXG)		+= sxg/
+obj-$(CONFIG_ME4000)		+= me4000/
diff --git a/trunk/drivers/staging/me4000/Kconfig b/trunk/drivers/staging/me4000/Kconfig
@@ -0,0 +1,10 @@
+config ME4000
+	tristate "Meilhaus ME-4000 support"
+	default n
+	depends on PCI
+	help
+	  This driver supports the Meilhaus ME-4000 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 me4000.
diff --git a/trunk/drivers/staging/me4000/Makefile b/trunk/drivers/staging/me4000/Makefile
@@ -0,0 +1 @@
+obj-$(CONFIG_ME4000)		+= me4000.o
diff --git a/trunk/drivers/staging/me4000/README b/trunk/drivers/staging/me4000/README
@@ -0,0 +1,13 @@
+
+TODO:
+	- checkpatch.pl cleanups
+	- sparse cleanups
+	- possible /proc interaction cleanups
+	- more info needed for Kconfig entry
+	- real device id?
+	- module parameter cleanup
+
+Please send patches to Greg Kroah-Hartman <gregkh@suse.de>
+and Cc: Wolfgang Beiter <w.beiter@aon.at> and
+Guenter Gebhardt <g.gebhardt@meilhaus.de>
+
Original file line number	Diff line number	Diff line change
Expand Up		@@ -29,4 +29,6 @@ source "drivers/staging/slicoss/Kconfig"

		source "drivers/staging/sxg/Kconfig"

		source "drivers/staging/me4000/Kconfig"

		endif # STAGING