From ecc13b72555323458c5e6931edf81918d9c9abbc Mon Sep 17 00:00:00 2001
From: Valentina Manea <valentina.manea.m@gmail.com>
Date: Sat, 8 Mar 2014 14:53:25 +0200
Subject: [PATCH] staging: usbip: userspace: move sysfs_utils to libsrc
Since it offers a API to both usbip tools and libusbip,
it is more appropriate to be place in the library.
Signed-off-by: Valentina Manea <valentina.manea.m@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
drivers/staging/usbip/userspace/libsrc/Makefile.am | 3 ++-
drivers/staging/usbip/userspace/{src => libsrc}/sysfs_utils.c | 0
drivers/staging/usbip/userspace/{src => libsrc}/sysfs_utils.h | 0
drivers/staging/usbip/userspace/src/Makefile.am | 4 +---
4 files changed, 3 insertions(+), 4 deletions(-)
rename drivers/staging/usbip/userspace/{src => libsrc}/sysfs_utils.c (100%)
rename drivers/staging/usbip/userspace/{src => libsrc}/sysfs_utils.h (100%)
diff --git a/drivers/staging/usbip/userspace/libsrc/Makefile.am b/drivers/staging/usbip/userspace/libsrc/Makefile.am
index 4921189e0260..7c8f8a4d54e4 100644
--- a/drivers/staging/usbip/userspace/libsrc/Makefile.am
+++ b/drivers/staging/usbip/userspace/libsrc/Makefile.am
@@ -4,4 +4,5 @@ libusbip_la_LDFLAGS = -version-info @LIBUSBIP_VERSION@
lib_LTLIBRARIES := libusbip.la
libusbip_la_SOURCES := names.c names.h usbip_host_driver.c usbip_host_driver.h \
- usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h
+ usbip_common.c usbip_common.h vhci_driver.c vhci_driver.h \
+ sysfs_utils.c sysfs_utils.h
diff --git a/drivers/staging/usbip/userspace/src/sysfs_utils.c b/drivers/staging/usbip/userspace/libsrc/sysfs_utils.c
similarity index 100%
rename from drivers/staging/usbip/userspace/src/sysfs_utils.c
rename to drivers/staging/usbip/userspace/libsrc/sysfs_utils.c
diff --git a/drivers/staging/usbip/userspace/src/sysfs_utils.h b/drivers/staging/usbip/userspace/libsrc/sysfs_utils.h
similarity index 100%
rename from drivers/staging/usbip/userspace/src/sysfs_utils.h
rename to drivers/staging/usbip/userspace/libsrc/sysfs_utils.h
diff --git a/drivers/staging/usbip/userspace/src/Makefile.am b/drivers/staging/usbip/userspace/src/Makefile.am
index 6c91bcb1e3bf..e81a4ebadeff 100644
--- a/drivers/staging/usbip/userspace/src/Makefile.am
+++ b/drivers/staging/usbip/userspace/src/Makefile.am
@@ -6,8 +6,6 @@ sbin_PROGRAMS := usbip usbipd
usbip_SOURCES := usbip.h utils.h usbip.c utils.c usbip_network.c \
usbip_attach.c usbip_detach.c usbip_list.c \
- usbip_bind.c usbip_unbind.c usbip_port.c \
- sysfs_utils.c
-
+ usbip_bind.c usbip_unbind.c usbip_port.c
usbipd_SOURCES := usbip_network.h usbipd.c usbip_network.c