Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6] / drivers / mtd / devices / doc2001plus.c

diff --git a/drivers/mtd/devices/doc2001plus.c b/drivers/mtd/devices/doc2001plus.c
index 01185593b2c20c4854075417a57786353d8cdb6d..83be3461658f22527a40ab1e57ec0efa503c8252 100644 (file)
--- a/drivers/mtd/devices/doc2001plus.c
+++ b/drivers/mtd/devices/doc2001plus.c
@@ -17,10 +17,8 @@
 #include <asm/io.h>
 #include <asm/uaccess.h>
 #include <linux/miscdevice.h>
-#include <linux/pci.h>
 #include <linux/delay.h>
 #include <linux/slab.h>
-#include <linux/sched.h>
 #include <linux/init.h>
 #include <linux/types.h>
 #include <linux/bitops.h>
@@ -750,7 +748,7 @@ static int doc_write(struct mtd_info *mtd, loff_t to, size_t len,
        WriteDOC(DoC_GetDataOffset(mtd, &fto), docptr, Mplus_FlashCmd);
 
        /* On interleaved devices the flags for 2nd half 512 are before data */
-       if (eccbuf && before)
+       if (before)
                fto -= 2;
 
        /* issue the Serial Data In command to initial the Page Program process */