Merge branch 'linus'

[mv-sheeva.git] / arch / um / sys-i386 / tls.c

diff --git a/arch/um/sys-i386/tls.c b/arch/um/sys-i386/tls.c
index 71b9796258ef650dc008a5b45a7965fbc8e873aa..643dab58572739d2b1f36f5c4ef32e6e0c1ebcc2 100644 (file)
--- a/arch/um/sys-i386/tls.c
+++ b/arch/um/sys-i386/tls.c
@@ -3,7 +3,6 @@
  * Licensed under the GPL
  */
 
-#include "linux/config.h"
 #include "linux/kernel.h"
 #include "linux/sched.h"
 #include "linux/slab.h"