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 /libdde_linux26/Makeconf | |
| 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 'libdde_linux26/Makeconf')
| -rw-r--r-- | libdde_linux26/Makeconf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libdde_linux26/Makeconf b/libdde_linux26/Makeconf index 4ee54c66..00c59092 100644 --- a/libdde_linux26/Makeconf +++ b/libdde_linux26/Makeconf @@ -39,7 +39,7 @@ ifeq ($(ARCH), x86) MY_DDE_INCDIR += $(OBJ_BASE)/include/linux-headers/asm/mach-default endif -PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) $(PKGDIR)/../libddekit/include +PRIVATE_INCDIR += $(MY_DDE_INCDIR) $(MY_LINUX26_INCDIR) $(PKGDIR)/../libddekit DEFINES += -D__KERNEL__ -DDDE_LINUX $(KBUILD_DEFINES) CPPFLAGS += $(KBUILD_CPPFLAGS) |