Merge git://git.denx.de/u-boot-x86

[people/ms/u-boot.git] / include / xyzModem.h

diff --git a/include/xyzModem.h b/include/xyzModem.h
index 0eddbbc78fd7f2d3aa82c35552460e8e49d1ccc1..4b667f7ba7dc7f99e7755365af9e02d47d70d524 100644 (file)
--- a/include/xyzModem.h
+++ b/include/xyzModem.h
@@ -44,9 +44,6 @@
 #define xyzModem_abort 2
 
 
-#ifdef REDBOOT
-extern getc_io_funcs_t xyzModem_io;
-#else
 #define CYGNUM_CALL_IF_SET_COMM_ID_QUERY_CURRENT
 #define CYGACC_CALL_IF_SET_CONSOLE_COMM(x)
 
@@ -60,12 +57,8 @@ typedef struct {
     char *filename;
     int   mode;
     int   chan;
-#ifdef CYGPKG_REDBOOT_NETWORKING
-    struct sockaddr_in *server;
-#endif
 } connection_info_t;
 
-#endif
 
 
 int   xyzModem_stream_open(connection_info_t *info, int *err);