From 9ab47efb165b122e2f929b4234a1a82311bb9edc Mon Sep 17 00:00:00 2001
From: matt mooney <mfm@muteddisk.com>
Date: Sun, 19 Jun 2011 22:44:34 -0700
Subject: [PATCH] --- yaml --- r: 259970 b: refs/heads/master c:
 4fd83e84d5069a17a00cbc345cfc045c00e4b7dc h: refs/heads/master v: v3

---
 [refs]                                         |  2 +-
 .../usbip/userspace/libsrc/stub_driver.c       |  2 ++
 .../usbip/userspace/libsrc/usbip_common.h      | 18 ++++++++----------
 .../staging/usbip/userspace/src/utils.c        |  1 +
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index fccac46fc5d1..0640c0dc2729 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 93e18e0ece647ace11a7cdfea4ae895077190f17
+refs/heads/master: 4fd83e84d5069a17a00cbc345cfc045c00e4b7dc
diff --git a/trunk/drivers/staging/usbip/userspace/libsrc/stub_driver.c b/trunk/drivers/staging/usbip/userspace/libsrc/stub_driver.c
index 4d4d17122ce9..6a1272d1b6bf 100644
--- a/trunk/drivers/staging/usbip/userspace/libsrc/stub_driver.c
+++ b/trunk/drivers/staging/usbip/userspace/libsrc/stub_driver.c
@@ -4,6 +4,8 @@
 
 #include <sys/types.h>
 #include <sys/stat.h>
+
+#include <errno.h>
 #include <unistd.h>
 
 #include "usbip.h"
diff --git a/trunk/drivers/staging/usbip/userspace/libsrc/usbip_common.h b/trunk/drivers/staging/usbip/userspace/libsrc/usbip_common.h
index 7dadb21304bb..eedefbd12ea6 100644
--- a/trunk/drivers/staging/usbip/userspace/libsrc/usbip_common.h
+++ b/trunk/drivers/staging/usbip/userspace/libsrc/usbip_common.h
@@ -2,20 +2,18 @@
  * Copyright (C) 2005-2007 Takahiro Hirofuchi
  */
 
-#ifndef _USBIP_COMMON_H
-#define _USBIP_COMMON_H
+#ifndef __USBIP_COMMON_H
+#define __USBIP_COMMON_H
+
+#include <sysfs/libsysfs.h>
 
-#include <unistd.h>
 #include <stdint.h>
-#include <syslog.h>
-#include <errno.h>
 #include <stdio.h>
-#include <string.h>
 #include <stdlib.h>
+#include <string.h>
 
-#include <sysfs/libsysfs.h>
-#include <netdb.h>
-#include <sys/socket.h>
+#include <syslog.h>
+#include <unistd.h>
 
 #ifndef USBIDS_FILE
 #define USBIDS_FILE "/usr/share/hwdata/usb.ids"
@@ -146,4 +144,4 @@ void usbip_names_free(void);
 void usbip_names_get_product(char *buff, size_t size, uint16_t vendor, uint16_t product);
 void usbip_names_get_class(char *buff, size_t size, uint8_t class, uint8_t subclass, uint8_t protocol);
 
-#endif
+#endif /* __USBIP_COMMON_H */
diff --git a/trunk/drivers/staging/usbip/userspace/src/utils.c b/trunk/drivers/staging/usbip/userspace/src/utils.c
index 1da1109d11d3..2a25cec5dae7 100644
--- a/trunk/drivers/staging/usbip/userspace/src/utils.c
+++ b/trunk/drivers/staging/usbip/userspace/src/utils.c
@@ -6,6 +6,7 @@
 #include <sysfs/libsysfs.h>
 
 #include <limits.h>
+#include <errno.h>
 #include <stdio.h>
 #include <string.h>