diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-01-09 02:38:23 -0500 |
| commit | da733563be5a9da26fe81d9f007262d00b846e22 (patch) | |
| tree | db28291df94a2043af2123911984c5c173da4e6f /arch/um/drivers/pcap_user.c | |
| parent | 6ccbcf2cb41131f8d56ef0723bf3f7c1f8486076 (diff) | |
| parent | dab78d7924598ea4031663dd10db814e2e324928 (diff) | |
Merge branch 'next' into for-linus
Diffstat (limited to 'arch/um/drivers/pcap_user.c')
| -rw-r--r-- | arch/um/drivers/pcap_user.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/um/drivers/pcap_user.c b/arch/um/drivers/pcap_user.c index 5f903587d69e..702a75b190ee 100644 --- a/arch/um/drivers/pcap_user.c +++ b/arch/um/drivers/pcap_user.c | |||
| @@ -9,9 +9,7 @@ | |||
| 9 | #include <asm/types.h> | 9 | #include <asm/types.h> |
| 10 | #include "net_user.h" | 10 | #include "net_user.h" |
| 11 | #include "pcap_user.h" | 11 | #include "pcap_user.h" |
| 12 | #include "kern_constants.h" | ||
| 13 | #include "um_malloc.h" | 12 | #include "um_malloc.h" |
| 14 | #include "user.h" | ||
| 15 | 13 | ||
| 16 | #define PCAP_FD(p) (*(int *)(p)) | 14 | #define PCAP_FD(p) (*(int *)(p)) |
| 17 | 15 | ||