patch-2.1.43 linux/drivers/sbus/char/tcx.c

Next file: linux/drivers/sbus/char/vfc_dev.c
Previous file: linux/drivers/sbus/char/sunkbd.c
Back to the patch index
Back to the overall index

diff -u --recursive --new-file v2.1.42/linux/drivers/sbus/char/tcx.c linux/drivers/sbus/char/tcx.c
@@ -1,4 +1,4 @@
-/* $Id: tcx.c,v 1.12 1997/04/14 17:04:51 jj Exp $
+/* $Id: tcx.c,v 1.15 1997/06/04 08:27:32 davem Exp $
  * tcx.c: SUNW,tcx 24/8bit frame buffer driver
  *
  * Copyright (C) 1996 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
@@ -16,9 +16,10 @@
 #include <asm/fbio.h>
 #include <asm/pgtable.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"
 
@@ -171,7 +172,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