From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Thu, 7 Jun 2007 06:31:58 +0000 (+0200)
Subject: Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git
X-Git-Tag: holmes-import~506^2~13^2~100
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=c460be258f74353287bb852c37c7782a0322a3c0;p=libucw.git

Merge with git+ssh://git.ucw.cz/projects/sherlock/GIT/sherlock.git
---

c460be258f74353287bb852c37c7782a0322a3c0
diff --cc lib/Makefile
index 73ec5d3a,8cc43c14..356391e5
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -61,8 -63,8 +64,8 @@@ LIBUCW_INCLUDES= 
  ifdef CONFIG_UCW_THREADS
  # Some modules require threading
  LIBS+=-lpthread
 -LIBUCW_MODS+=threads-conf workqueue
 -LIBUCW_INCLUDES+=workqueue.h semaphore.h
 +LIBUCW_MODS+=threads-conf workqueue asio fb-direct
- LIBUCW_INCLUDES+=workqueue.h asio.h
++LIBUCW_INCLUDES+=workqueue.h semaphore.h asio.h
  endif
  
  ifdef CONFIG_OWN_REGEX