Merge branch 'master' of rom.etherboot.org:/pub/scm/gpxe

src/arch/i386/prefix/int19exit.c

@@ -1,31 +0,0 @@
-#include "bochs.h"
-#include "realmode.h"
-
-/** @file
- *
- * The "exit via INT 19" exit path.
- *
- * INT 19 is the old (pre-BBS) "boot system" interrupt.  It is
- * conventionally used now to return from a failed boot from floppy
- * disk.
- *
- */
-
-/**
- * Exit via INT19
- *
- * @v ix86		i386 register values to be loaded on exit
- * @ret Never		-
- * @err None		-
- *
- * Exit back to the BIOS by switching to real mode, reloading the
- * registers as they were before Etherboot started, and executing INT
- * 19.
- *
- * @bug Not yet implemented
- *
- */
-void exit_via_int19 ( __unused struct i386_all_regs *ix86 ) {
-	bochsbp();
-	/* Placeholder */
-}

src/tests/iscsiboot.c

@@ -5,6 +5,7 @@
 #include <gpxe/netdevice.h>
 #include <gpxe/iscsi.h>
 #include <gpxe/ibft.h>
+#include <gpxe/tcpip.h>
 #include <int13.h>
 
 static struct iscsi_device test_iscsidev;