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 /dde_e1000/main.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 'dde_e1000/main.c')
| -rw-r--r-- | dde_e1000/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dde_e1000/main.c b/dde_e1000/main.c index 63ab182f..98f4452a 100644 --- a/dde_e1000/main.c +++ b/dde_e1000/main.c @@ -6,7 +6,7 @@ #include <linux/init.h> // initcall() #include <linux/delay.h> // msleep() -#include <machdev.h> +#include <hurd/machdev.h> int using_std = 1; |