Merge branch 'omap-pool'

[linux-2.6-omap-h63xx.git] / fs / gfs2 / sys.h

diff --git a/fs/gfs2/sys.h b/fs/gfs2/sys.h
index 62c8ed89ab9c64cda6b03521f54afa10a3d9c8da..e94560e836d79d008eb33100e00826952cea6efb 100644 (file)
--- a/fs/gfs2/sys.h
+++ b/fs/gfs2/sys.h
@@ -1,18 +1,17 @@
 /*
  * 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.
  */
 
 #ifndef __SYS_DOT_H__
 #define __SYS_DOT_H__
 
-/* Allow args to be passed to GFS2 when using an initial ram disk */
-extern char *gfs2_sys_margs;
-extern spinlock_t gfs2_sys_margs_lock;
+#include <linux/spinlock.h>
+struct gfs2_sbd;
 
 int gfs2_sys_fs_add(struct gfs2_sbd *sdp);
 void gfs2_sys_fs_del(struct gfs2_sbd *sdp);