mtd/drivers/mtd/chips cfi_cmdset_0001.c,1.172,1.173

tpoynor at infradead.org tpoynor at infradead.org
Wed Mar 30 18:57:33 EST 2005


Update of /home/cvs/mtd/drivers/mtd/chips
In directory phoenix.infradead.org:/tmp/cvs-serv30624/drivers/mtd/chips

Modified Files:
	cfi_cmdset_0001.c 
Log Message:
Avoid compile warnings for Intel CFI flash without OTP support.

Signed-off-by: Todd Poynor <tpoynor at mvista.com>


Index: cfi_cmdset_0001.c
===================================================================
RCS file: /home/cvs/mtd/drivers/mtd/chips/cfi_cmdset_0001.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- cfi_cmdset_0001.c	29 Mar 2005 22:06:37 -0000	1.172
+++ cfi_cmdset_0001.c	30 Mar 2005 23:57:30 -0000	1.173
@@ -54,6 +54,7 @@
 static void cfi_intelext_sync (struct mtd_info *);
 static int cfi_intelext_lock(struct mtd_info *mtd, loff_t ofs, size_t len);
 static int cfi_intelext_unlock(struct mtd_info *mtd, loff_t ofs, size_t len);
+#ifdef CONFIG_MTD_OTP
 static int cfi_intelext_read_fact_prot_reg (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
 static int cfi_intelext_read_user_prot_reg (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
 static int cfi_intelext_write_user_prot_reg (struct mtd_info *, loff_t, size_t, size_t *, u_char *);
@@ -62,6 +63,7 @@
 					    struct otp_info *, size_t);
 static int cfi_intelext_get_user_prot_info (struct mtd_info *,
 					    struct otp_info *, size_t);
+#endif
 static int cfi_intelext_suspend (struct mtd_info *);
 static void cfi_intelext_resume (struct mtd_info *);
 





More information about the linux-mtd-cvs mailing list