git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://github.com/rustyrussell/linux
[pandora-kernel.git]
/
arch
/
um
/
drivers
/
pcap_user.c
diff --git
a/arch/um/drivers/pcap_user.c
b/arch/um/drivers/pcap_user.c
index
5f90358
..
702a75b
100644
(file)
--- a/
arch/um/drivers/pcap_user.c
+++ b/
arch/um/drivers/pcap_user.c
@@
-9,9
+9,7
@@
#include <asm/types.h>
#include "net_user.h"
#include "pcap_user.h"
-#include "kern_constants.h"
#include "um_malloc.h"
-#include "user.h"
#define PCAP_FD(p) (*(int *)(p))