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

• Lines: 30
• Date: Thu Jun 12 16:22:07 1997
• Orig file: v2.1.42/linux/drivers/sbus/char/bwtwo.c
• Orig date: Wed Apr 23 19:01:21 1997

diff -u --recursive --new-file v2.1.42/linux/drivers/sbus/char/bwtwo.c linux/drivers/sbus/char/bwtwo.c
@@ -1,4 +1,4 @@
-/* $Id: bwtwo.c,v 1.13 1997/04/14 17:04:55 jj Exp $
+/* $Id: bwtwo.c,v 1.16 1997/06/04 08:27:26 davem Exp $
  * bwtwo.c: bwtwo console driver
  *
  * Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
@@ -15,9 +15,11 @@
 #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"
 
@@ -91,7 +93,7 @@
 				 vma->vm_page_prot, fb->space);
 	if (r) return -EAGAIN;
 	vma->vm_inode = inode;
-	inode->i_count++;
+	atomic_inc(&inode->i_count);
 	return 0;
 }