---

yaml --- r: 115559 b: refs/heads/master c: 05a1f28 h: refs/heads/master i: 115557: 2a3de31 115555: b5d9839 115551: 3642bf9 v: v3
git-mirror · Oct 10, 2008 · 1ea54b5 · 1ea54b5
1 parent e53e57d
commit 1ea54b5
Show file tree

Hide file tree

Showing 9 changed files with 1,574 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 866b8695d67e83f47194731d3a7ba55826a7ec70
+refs/heads/master: 05a1f28e879e3b4d6a9c08e30b1898943f77b6e7
diff --git a/trunk/drivers/staging/Kconfig b/trunk/drivers/staging/Kconfig
@@ -33,4 +33,6 @@ source "drivers/staging/me4000/Kconfig"
 
 source "drivers/staging/go7007/Kconfig"
 
+source "drivers/staging/usbip/Kconfig"
+
 endif # STAGING
diff --git a/trunk/drivers/staging/Makefile b/trunk/drivers/staging/Makefile
@@ -5,3 +5,4 @@ obj-$(CONFIG_SLICOSS)		+= slicoss/
 obj-$(CONFIG_SXG)		+= sxg/
 obj-$(CONFIG_ME4000)		+= me4000/
 obj-$(CONFIG_VIDEO_GO7007)	+= go7007/
+obj-$(CONFIG_USB_IP_COMMON)	+= usbip/
diff --git a/trunk/drivers/staging/usbip/Kconfig b/trunk/drivers/staging/usbip/Kconfig
@@ -0,0 +1,14 @@
+config USB_IP_COMMON
+	tristate "USB IP support (EXPERIMENTAL)"
+	depends on USB && EXPERIMENTAL
+	default N
+	---help---
+	  This enables pushing USB packets over IP to allow remote
+	  machines access to USB devices directly.  For more details,
+	  and links to the userspace utility programs to let this work
+	  properly, see http://usbip.naist.jp/
+
+	  To compile this driver as a module, choose M here: the
+	  module will be called usbip_common_mod.
+
+	  If unsure, say N.
diff --git a/trunk/drivers/staging/usbip/Makefile b/trunk/drivers/staging/usbip/Makefile
@@ -0,0 +1,6 @@
+obj-$(CONFIG_USB_IP_COMMON) += usbip_common_mod.o
+usbip_common_mod-objs := usbip_common.o usbip_event.o
+
+ifeq ($(CONFIG_USB_DEBUG),y)
+	EXTRA_CFLAGS += -DDEBUG
+endif
diff --git a/trunk/drivers/staging/usbip/README b/trunk/drivers/staging/usbip/README
@@ -0,0 +1,6 @@
+TODO:
+	- more discussion about the protocol
+	- testing
+	- review of the userspace interface
+
+Please send patches for this code to Greg Kroah-Hartman <greg@kroah.com>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -33,4 +33,6 @@ source "drivers/staging/me4000/Kconfig"

		source "drivers/staging/go7007/Kconfig"

		source "drivers/staging/usbip/Kconfig"

		endif # STAGING