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

[linux-2.6-omap-h63xx.git] / arch / um / kernel / umid.c

diff --git a/arch/um/kernel/umid.c b/arch/um/kernel/umid.c
index 039e16efcd5571a7a520f051cf5efa1c61c61b54..81e07e2be3ae540abb2715ca56824f02b79c6cea 100644 (file)
--- a/arch/um/kernel/umid.c
+++ b/arch/um/kernel/umid.c
@@ -1,13 +1,12 @@
-/* 
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
+/*
+ * Copyright (C) 2001 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
  * Licensed under the GPL
  */
 
-#include "asm/errno.h"
+#include <asm/errno.h>
 #include "init.h"
-#include "os.h"
 #include "kern.h"
-#include "linux/kernel.h"
+#include "os.h"
 
 /* Changed by set_umid_arg */
 static int umid_inited = 0;
@@ -16,16 +15,16 @@ static int __init set_umid_arg(char *name, int *add)
 {
        int err;
 
-       if(umid_inited){
+       if (umid_inited) {
                printf("umid already set\n");
                return 0;
        }
 
        *add = 0;
        err = set_umid(name);
-       if(err == -EEXIST)
+       if (err == -EEXIST)
                printf("umid '%s' already in use\n", name);
-       else if(!err)
+       else if (!err)
                umid_inited = 1;
 
        return 0;