projects
/
linux-drm-fsl-dcu.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge ../linux-2.6-watchdog-mm
[linux-drm-fsl-dcu.git]
/
arch
/
um
/
drivers
/
net_user.c
diff --git
a/arch/um/drivers/net_user.c
b/arch/um/drivers/net_user.c
index 107c5e43fa00fec37d6fcf8c3b01851274a9b87e..0ffd7ac295d45e0fd5bdc0e4e8c36eab42c517cd 100644
(file)
--- a/
arch/um/drivers/net_user.c
+++ b/
arch/um/drivers/net_user.c
@@
-12,11
+12,13
@@
#include <string.h>
#include <sys/socket.h>
#include <sys/wait.h>
#include <string.h>
#include <sys/socket.h>
#include <sys/wait.h>
+#include <sys/time.h>
#include "user.h"
#include "user_util.h"
#include "kern_util.h"
#include "net_user.h"
#include "os.h"
#include "user.h"
#include "user_util.h"
#include "kern_util.h"
#include "net_user.h"
#include "os.h"
+#include "um_malloc.h"
int tap_open_common(void *dev, char *gate_addr)
{
int tap_open_common(void *dev, char *gate_addr)
{