summaryrefslogtreecommitdiff
path: root/lib/ts_fsm.c
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-07-03 18:25:08 +0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-07-03 18:25:08 +0400
commit0a1340c185734a57fbf4775927966ad4a1347b02 (patch)
treed9ed8f0dd809a7c542a3356601125ea5b5aaa804 /lib/ts_fsm.c
parentaf18ddb8864b096e3ed4732e2d4b21c956dcfe3a (diff)
parent29454dde27d8e340bb1987bad9aa504af7081eba (diff)
downloadlinux-0a1340c185734a57fbf4775927966ad4a1347b02.tar.xz
Merge rsync://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts: include/linux/kernel.h
Diffstat (limited to 'lib/ts_fsm.c')
-rw-r--r--lib/ts_fsm.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/ts_fsm.c b/lib/ts_fsm.c
index ca3211206eef..87847c2ae9e2 100644
--- a/lib/ts_fsm.c
+++ b/lib/ts_fsm.c
@@ -26,7 +26,6 @@
* however while in strict mode the average runtime can be better.
*/
-#include <linux/config.h>
#include <linux/module.h>
#include <linux/types.h>
#include <linux/string.h>