Merge branch 'master' of ssh://master.kernel.org/pub/scm/linux/kernel/git/mchehab...

[powerpc.git] / fs / gfs2 / mount.c

diff --git a/fs/gfs2/mount.c b/fs/gfs2/mount.c
index e90ea7d..32caecd 100644 (file)
--- a/fs/gfs2/mount.c
+++ b/fs/gfs2/mount.c
@@ -1,22 +1,20 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
-#include <linux/sched.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
 #include <linux/completion.h>
 #include <linux/buffer_head.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
+#include <linux/lm_interface.h>
 
 #include "gfs2.h"
-#include "lm_interface.h"
 #include "incore.h"
 #include "mount.h"
 #include "sys.h"
@@ -204,11 +202,11 @@ int gfs2_mount_args(struct gfs2_sbd *sdp, char *data_arg, int remount)
 
        return error;
 
- need_value:
+need_value:
        fs_info(sdp, "need value for option %s\n", o);
        return -EINVAL;
 
- cant_remount:
+cant_remount:
        fs_info(sdp, "can't remount with option %s\n", o);
        return -EINVAL;
 }