diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-22 01:55:47 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-22 01:55:47 +0000 |
| commit | c0c35f90e218835ef0f8c0b67399ad6533763ed0 (patch) | |
| tree | 170c7320a73a56864c1f0e69324071b93420227e /dde_pcnet32 | |
| parent | 871cd76365ed6ef9fa89282e31e21f20d6c1db62 (diff) | |
| parent | 258642ef93bda485b8904cfe47ab34644247229e (diff) | |
Merge branch 'dde-clean' into upstream-merged
Diffstat (limited to 'dde_pcnet32')
| -rw-r--r-- | dde_pcnet32/Makefile | 2 | ||||
| -rw-r--r-- | dde_pcnet32/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dde_pcnet32/Makefile b/dde_pcnet32/Makefile index bcdcb425..0268d80b 100644 --- a/dde_pcnet32/Makefile +++ b/dde_pcnet32/Makefile @@ -8,7 +8,7 @@ TARGET = dde_pcnet32 SRC_C = main.c pcnet32.c LIBS += $(libmachdev_path) -ldde_linux26.o -ldde_linux26_net $(libddekit_path) -lfshelp -ltrivfs -lpciaccess -lz -lthreads -lshouldbeinlibc -lports $(libslab_path) $(libbpf_path) -CFLAGS += -g -I$(PKGDIR)/include -I../libmachdev +CFLAGS += -g -I$(PKGDIR)/include -I$(BUILDDIR)/include # DDE configuration include $(L4DIR)/Makeconf diff --git a/dde_pcnet32/main.c b/dde_pcnet32/main.c index 63ab182f..98f4452a 100644 --- a/dde_pcnet32/main.c +++ b/dde_pcnet32/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; |