Staging: USB/IP: add common functions needed

This adds the common functions needed by both the host and client side
of the USB/IP code.

Brian Merrell cleaned up a lot of this code and submitted it for
inclusion.  Greg also did a lot of cleanup.

Signed-off-by: Brian G. Merrell <bgmerrell@novell.com>
Cc: Takahiro Hirofuchi <hirofuchi@users.sourceforge.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/Kconfig b/drivers/staging/Kconfig
index f16bc9cdaf331647e802db0c50646b7bb2a39dbe..4dbf795df7447b8c81309c40424948f997ca2f33 100644 (file)
--- a/drivers/staging/Kconfig
+++ b/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/drivers/staging/Makefile b/drivers/staging/Makefile
index aa61662e6321b8474b24e8c0afb04b491654017b..be42c0d4db0e1b263e0655f62eba49bf7374b623 100644 (file)
--- a/drivers/staging/Makefile
+++ b/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 --cc drivers/staging/usbip/Kconfig
Simple merge

diff --cc drivers/staging/usbip/Makefile
Simple merge

diff --cc drivers/staging/usbip/README
Simple merge

diff --cc drivers/staging/usbip/usbip_common.c
Simple merge

diff --cc drivers/staging/usbip/usbip_common.h
Simple merge

diff --cc drivers/staging/usbip/usbip_event.c
Simple merge