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 /libddekit/memory.c | |
| 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 'libddekit/memory.c')
| -rw-r--r-- | libddekit/memory.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libddekit/memory.c b/libddekit/memory.c index b4723b96..34b283b3 100644 --- a/libddekit/memory.c +++ b/libddekit/memory.c @@ -18,7 +18,7 @@ #include <sys/mman.h> #include "mach_U.h" -#include "libhurd-slab/slab.h" +#include <hurd/slab.h> #include "util.h" #include "ddekit/memory.h" |