projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...
[powerpc.git]
/
arch
/
um
/
drivers
/
daemon_user.c
diff --git
a/arch/um/drivers/daemon_user.c
b/arch/um/drivers/daemon_user.c
index
77954ea
..
310af0f
100644
(file)
--- a/
arch/um/drivers/daemon_user.c
+++ b/
arch/um/drivers/daemon_user.c
@@
-17,6
+17,7
@@
#include "user_util.h"
#include "user.h"
#include "os.h"
#include "user_util.h"
#include "user.h"
#include "os.h"
+#include "um_malloc.h"
#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)
#define MAX_PACKET (ETH_MAX_PACKET + ETH_HEADER_OTHER)