summaryrefslogtreecommitdiffstats
path: root/drivers/sbus/char/cgsix.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/sbus/char/cgsix.c')
-rw-r--r--drivers/sbus/char/cgsix.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/sbus/char/cgsix.c b/drivers/sbus/char/cgsix.c
index 5f91c1308..e53fcf09e 100644
--- a/drivers/sbus/char/cgsix.c
+++ b/drivers/sbus/char/cgsix.c
@@ -1,4 +1,4 @@
-/* $Id: cgsix.c,v 1.27 1997/04/14 17:04:55 jj Exp $
+/* $Id: cgsix.c,v 1.30 1997/06/04 08:27:28 davem Exp $
* cgsix.c: cgsix frame buffer driver
*
* Copyright (C) 1996 Miguel de Icaza (miguel@nuclecu.unam.mx)
@@ -15,9 +15,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"
@@ -296,7 +297,7 @@ cg6_mmap (struct inode *inode, struct file *file, struct vm_area_struct *vma,
page += map_size;
}
vma->vm_inode = inode;
- inode->i_count++;
+ atomic_inc(&inode->i_count);
return 0;
}