patch-2.1.43 linux/drivers/sbus/char/leo.c
Next file: linux/drivers/sbus/char/suncons.c
Previous file: linux/drivers/sbus/char/creator.c
Back to the patch index
Back to the overall index
- Lines: 29
- Date:
Thu Jun 12 16:22:07 1997
- Orig file:
v2.1.42/linux/drivers/sbus/char/leo.c
- Orig date:
Wed Apr 23 19:01:21 1997
diff -u --recursive --new-file v2.1.42/linux/drivers/sbus/char/leo.c linux/drivers/sbus/char/leo.c
@@ -1,4 +1,4 @@
-/* $Id: leo.c,v 1.15 1997/04/14 17:04:54 jj Exp $
+/* $Id: leo.c,v 1.18 1997/06/04 08:27:30 davem Exp $
* leo.c: SUNW,leo 24/8bit frame buffer driver
*
* Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
@@ -17,9 +17,10 @@
#include <asm/delay.h>
#include <asm/uaccess.h>
-#include "../../char/vt_kern.h"
-#include "../../char/selection.h"
-#include "../../char/console_struct.h"
+/* These must be included after asm/fbio.h */
+#include <linux/vt_kern.h>
+#include <linux/selection.h>
+#include <linux/console_struct.h>
#include "fb.h"
#include "cg_common.h"
@@ -221,7 +222,7 @@
page += map_size;
}
vma->vm_inode = inode;
- inode->i_count++;
+ atomic_inc(&inode->i_count);
return 0;
}
FUNET's LINUX-ADM group, linux-adm@nic.funet.fi
TCL-scripts by Sam Shen, slshen@lbl.gov