diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:31:00 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:31:00 +0200 |
| commit | fcdea94c3fddd42de30e6294b02fc3fa869c888e (patch) | |
| tree | 170c7320a73a56864c1f0e69324071b93420227e /libmachdev/if_hdr.h | |
| parent | 19796a75ab8ba43b31e230ea169d5383c6392bfc (diff) | |
| parent | c0c35f90e218835ef0f8c0b67399ad6533763ed0 (diff) | |
Merge branch 'upstream-merged' of git.debian.org:/git/pkg-hurd/hurd into upstream-merged
Conflicts:
pfinet/ethernet.c
Diffstat (limited to 'libmachdev/if_hdr.h')
| -rw-r--r-- | libmachdev/if_hdr.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmachdev/if_hdr.h b/libmachdev/if_hdr.h index 74d0fa8a..32497206 100644 --- a/libmachdev/if_hdr.h +++ b/libmachdev/if_hdr.h @@ -62,7 +62,7 @@ #include <queue.h> #include <cthreads.h> -#include <bpf_impl.h> +#include <hurd/bpf_impl.h> #if 0 /* |