mtd/drivers/mtd/chips sharp.c,1.12,1.13
David Woodhouse
dwmw2 at infradead.org
Mon Jul 12 10:06:37 EDT 2004
Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv24660
Modified Files:
sharp.c
Log Message:
Merge with 2.6
Index: sharp.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/sharp.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- sharp.c 28 May 2003 15:39:52 -0000 1.12
+++ sharp.c 12 Jul 2004 14:06:34 -0000 1.13
@@ -22,7 +22,6 @@
#include <linux/kernel.h>
#include <linux/module.h>
-#include <linux/version.h>
#include <linux/types.h>
#include <linux/sched.h>
#include <linux/errno.h>
@@ -31,6 +30,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/cfi.h>
#include <linux/delay.h>
+#include <linux/init.h>
#define CMD_RESET 0xffffffff
#define CMD_READ_ID 0x90909090
@@ -155,7 +155,7 @@
map->fldrv = &sharp_chipdrv;
map->fldrv_priv = sharp;
- MOD_INC_USE_COUNT;
+ __module_get(THIS_MODULE);
return mtd;
}
@@ -435,7 +435,7 @@
unsigned long adr)
{
int ret;
- int timeo;
+ unsigned long timeo;
int status;
DECLARE_WAITQUEUE(wait, current);
More information about the linux-mtd-cvs
mailing list