Merge branch 'upstream-jeff' of git://git.kernel.org/pub/scm/linux/kernel/git/romieu...

[linux-2.6-omap-h63xx.git] / arch / um / drivers / null.c

diff --git a/arch/um/drivers/null.c b/arch/um/drivers/null.c
index b808641ee67935c0fb013a5df767ead3fabde832..2b45a1446c86b5bf34f01cfe9d71d19ec1a118cc 100644 (file)
--- a/arch/um/drivers/null.c
+++ b/arch/um/drivers/null.c
@@ -1,4 +1,4 @@
-/* 
+/*
  * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{linux.intel,addtoit}.com)
  * Licensed under the GPL
  */
@@ -6,10 +6,10 @@
 #include <stddef.h>
 #include <errno.h>
 #include <fcntl.h>
-#include "os.h"
 #include "chan_user.h"
+#include "os.h"
 
-/* This address is used only as a unique identifer */
+/* This address is used only as a unique identifier */
 static int null_chan;
 
 static void *null_init(char *str, int device, const struct chan_opts *opts)