From 2ef69f42d8372d0efc046e590191d73573b545fa Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Wed, 24 Dec 2014 11:20:40 +0100
Subject: [PATCH] zynq: fix kernel configuration so it builds

---
 sys/src/9/zynq/trap.c | 6 +++---
 sys/src/9/zynq/zynq   | 8 ++------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/sys/src/9/zynq/trap.c b/sys/src/9/zynq/trap.c
index 2173bbd8b..337877c9c 100644
--- a/sys/src/9/zynq/trap.c
+++ b/sys/src/9/zynq/trap.c
@@ -203,7 +203,7 @@ syscall(Ureg *ureg)
 			syscallfmt(scallnr, ureg->pc, (va_list) up->s.args);
 			s = splhi();
 			up->procctl = Proc_stopme;
-			procctl(up);
+			procctl();
 			splx(s);
 			startns = todget(nil);
 		}
@@ -234,7 +234,7 @@ syscall(Ureg *ureg)
 		sysretfmt(scallnr, (va_list) up->s.args, ret, startns, stopns);
 		s = splhi();
 		up->procctl = Proc_stopme;
-		procctl(up);
+		procctl();
 		splx(s);
 	}
 	
@@ -261,7 +261,7 @@ notify(Ureg *ureg)
 	Note *n;
 
 	if(up->procctl)
-		procctl(up);
+		procctl();
 	if(up->nnote == 0)
 		return 0;
 
diff --git a/sys/src/9/zynq/zynq b/sys/src/9/zynq/zynq
index c769920f3..75d244ab7 100644
--- a/sys/src/9/zynq/zynq
+++ b/sys/src/9/zynq/zynq
@@ -26,7 +26,7 @@ link
 	etherzynq
 	ethermedium
 	loopbackmedium
-	usbehci usbehcizynq
+#	usbehci usbehcizynq
 
 misc
 	uartzynq
@@ -45,12 +45,8 @@ ip
 port
 	int cpuserver = 0;
 
-boot boot
-	tcp
-	local
-
 bootdir
-	boot$CONF.out boot
 	/$objtype/bin/paqfs
 	/$objtype/bin/auth/factotum
+	boot
 	bootfs.paq