Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6

Conflicts:
	Documentation/feature-removal-schedule.txt
	drivers/staging/bcm/headers.h
	drivers/staging/brcm80211/brcmfmac/dhd_linux.c
	drivers/staging/brcm80211/brcmfmac/dhd_sdio.c
	drivers/staging/brcm80211/brcmfmac/wl_cfg80211.h
	drivers/staging/brcm80211/brcmfmac/wl_iw.c
	drivers/staging/et131x/et131x_netdev.c
	drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
	drivers/staging/rtl8192e/r8192E.h
	drivers/staging/usbip/userspace/src/utils.h

1 files changed, 26 insertions, 0 deletions

diff --git a/drivers/staging/usbip/userspace/src/utils.h b/drivers/staging/usbip/userspace/src/utils.h
index fdcb14dc0fb..c36aa271118 100644
--- a/drivers/staging/usbip/userspace/src/utils.h
+++ b/drivers/staging/usbip/userspace/src/utils.h
@@ -22,3 +22,29 @@
 int modify_match_busid(char *busid, int add);
 
 #endif /* __UTILS_H */
+#include <sysfs/libsysfs.h>
+#include <glib.h>
+#include <unistd.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <stdlib.h>
+#include <time.h>
+#include <errno.h>
+
+
+
+/* Be sync to kernel header */
+#define BUS_ID_SIZE 20
+
+int read_string(char *path, char *, size_t len);
+int read_integer(char *path);
+int getdevicename(char *busid, char *name, size_t len);
+int getdriver(char *busid, int conf, int infnum, char *driver, size_t len);
+int read_bNumInterfaces(char *busid);
+int read_bConfigurationValue(char *busid);
+int write_integer(char *path, int value);
+int write_bConfigurationValue(char *busid, int config);
+int read_bDeviceClass(char *busid);
+int readline(int sockfd, char *str, int strlen);
+int writeline(int sockfd, char *buff, int bufflen);