mtd/include/linux/mtd nftl.h,1.11,1.12

[David Woodhouse]

Update of /home/cvs/mtd/include/linux/mtd
In directory phoenix.infradead.org:/tmp/cvs-serv22869

Modified Files:
	nftl.h 
Log Message:
Missed parts of conversion to blktrans


Index: nftl.h
===================================================================
RCS file: /home/cvs/mtd/include/linux/mtd/nftl.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- nftl.h	18 Jun 2002 13:54:24 -0000	1.11
+++ nftl.h	20 May 2003 15:36:29 -0000	1.12
@@ -1,15 +1,14 @@
-
-/* Defines for NAND Flash Translation Layer  */
-/* (c) 1999 Machine Vision Holdings, Inc.    */
-/* Author: David Woodhouse <dwmw2 at mvhi.com>  */
-/* $Id$ */
+/*
+ * $Id$
+ *
+ * (C) 1999-2003 David Woodhouse <dwmw2 at infradead.org>
+ */
 
 #ifndef __MTD_NFTL_H__
 #define __MTD_NFTL_H__
 
-#ifndef __BOOT__
 #include <linux/mtd/mtd.h>
-#endif
+#include <linux/mtd/blktrans.h>
 
 /* Block Control Information */
 
@@ -84,8 +83,7 @@
 #define BLOCK_RESERVED     0xfffc /* bios block or bad block */
 
 struct NFTLrecord {
-	struct mtd_info *mtd;
-	struct semaphore mutex;
+	struct mtd_blktrans_dev mbd;
 	__u16 MediaUnit, SpareMediaUnit;
 	__u32 EraseSize;
 	struct NFTLMediaHeader MediaHdr;