Merge branch 'master' of git://github.com/MattColyer/libiphone into martin

Conflicts:
	src/Makefile.am

1 files changed, 1 insertions, 2 deletions

diff --git a/src/NotificationProxy.h b/src/NotificationProxy.h
index 3552b79..afae98a 100644
--- a/src/NotificationProxy.h
+++ b/src/NotificationProxy.h
@@ -19,13 +19,12 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA 
  */
 #include "libiphone/libiphone.h"
-#include "usbmux.h"
 #include "iphone.h"
 
 #include <glib.h>
 
 struct iphone_np_client_int {
-        iphone_umux_client_t connection;
+        int sfd;
         GMutex *mutex;
         GThread *notifier;
 };