diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:28:56 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-04-08 02:28:56 +0200 |
| commit | c6db537edac054a03847b1b99f78c00703f48d6b (patch) | |
| tree | b68068a7f8b5ae8b346a4f8855459e73ed4a0d01 /dde_ne2k_pci/main.c | |
| parent | 8df772b3c665e663f6f9d2a70f9c691590bd3f91 (diff) | |
| parent | a6a2e4c910172d8309d38b914459d9b41509c411 (diff) | |
Merge branch 'dde' of git.debian.org:/git/pkg-hurd/hurd into dde
Conflicts:
pfinet/ethernet.c
Diffstat (limited to 'dde_ne2k_pci/main.c')
| -rw-r--r-- | dde_ne2k_pci/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dde_ne2k_pci/main.c b/dde_ne2k_pci/main.c index 63ab182f..98f4452a 100644 --- a/dde_ne2k_pci/main.c +++ b/dde_ne2k_pci/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; |