--- src/sys/boot/i386/loader/Attic/conf.c	2003/11/10 06:08:36	1.3
+++ src/sys/boot/i386/loader/Attic/conf.c	2005/09/03 23:52:49	1.4
@@ -42,10 +42,6 @@
  * XXX as libi386 and biosboot merge, some of these can become linker sets.
  */
 
-#if defined(LOADER_NFS_SUPPORT) && defined(LOADER_TFTP_SUPPORT)
-#error "Cannot have both tftp and nfs support yet."
-#endif
-
 /* Exported for libstand */
 struct devsw *devsw[] = {
     &bioscd,
@@ -68,12 +64,12 @@ struct fs_ops *file_system[] = {
 #ifdef LOADER_BZIP2_SUPPORT
     &bzipfs_fsops,
 #endif
-#ifdef LOADER_NFS_SUPPORT 
-    &nfs_fsops,
-#endif
 #ifdef LOADER_TFTP_SUPPORT
     &tftp_fsops,
 #endif
+#ifdef LOADER_NFS_SUPPORT 
+    &nfs_fsops,
+#endif
     NULL
 };