vx32

commit dfaa14bcd11bfda56eba398579fb04a5955860b2
parent 2058e68928778d3bd79d34ee30286fe23a431e7d
Author: Jesus Galan Lopez (yiyus) <yiyu.jgl@gmail.com>
Date:   Mon, 21 Jun 2010 23:01:48 +0200

merge heads

--HG--
rename : src/9vx/etherve.c => src/9vx/etherpcap.c

Diffstat:
src/9vx/a/fns.h
 | 
1
-
src/9vx/main.c
 | 
1
+

2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/9vx/a/fns.h b/src/9vx/a/fns.h
@@ -80,7 +80,6 @@ void	kbdinit(void);
 #define	kmapinval()
 void	lgdt(ushort[3]);
 void	lidt(ushort[3]);
-void	links(void);
 void	ltr(ulong);
 void	mach0init(void);
 void	mathinit(void);
diff --git a/src/9vx/main.c b/src/9vx/main.c
@@ -112,6 +112,7 @@ main(int argc, char **argv)
 	nofork = 0;
 	nve = 0;
 	usetty = 0;
+	nve = 0;
 	localroot = nil;
 	ARGBEGIN{
 	/* debugging options */