diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-22 01:50:58 +0000 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2012-02-22 01:50:58 +0000 |
| commit | 258642ef93bda485b8904cfe47ab34644247229e (patch) | |
| tree | b68068a7f8b5ae8b346a4f8855459e73ed4a0d01 /dde_e100 | |
| parent | 2d149d8feae502439c5f21a6290c8a3ac7b18434 (diff) | |
| parent | a6a2e4c910172d8309d38b914459d9b41509c411 (diff) | |
Merge branch 'dde' into dde-clean
Diffstat (limited to 'dde_e100')
| -rw-r--r-- | dde_e100/Makefile | 2 | ||||
| -rw-r--r-- | dde_e100/main.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dde_e100/Makefile b/dde_e100/Makefile index 1fa82e1a..eaed375f 100644 --- a/dde_e100/Makefile +++ b/dde_e100/Makefile @@ -8,7 +8,7 @@ TARGET = dde_e100 SRC_C = main.c e100.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_e100/main.c b/dde_e100/main.c index 63ab182f..98f4452a 100644 --- a/dde_e100/main.c +++ b/dde_e100/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; |