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/MobileSync.h b/src/MobileSync.h
index 7655b59..495e702 100644
--- a/src/MobileSync.h
+++ b/src/MobileSync.h
@@ -21,7 +21,6 @@
 #ifndef MOBILESYNC_H
 #define MOBILESYNC_H
 
-#include "usbmux.h"
 #include "iphone.h"
 #include "utils.h"
 
@@ -30,7 +29,7 @@
 
 
 struct iphone_msync_client_int {
-        iphone_umux_client_t connection;
+        int sfd;
 };