Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[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 a3188e861cc7f9eba6efbc3c08765800e2cb06b3..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"
@@ -378,7 +377,7 @@ static int __init __setup_host_supports_tls(void) {
        } else
                printk(KERN_ERR "  Host TLS support NOT detected! "
                                "TLS support inside UML will not work\n");
-       return 1;
+       return 0;
 }
 
 __initcall(__setup_host_supports_tls);