patch-2.4.2 linux/drivers/mtd/octagon-5066.c

• Lines: 24
• Date: Fri Feb 16 16:02:36 2001
• Orig file: v2.4.1/linux/drivers/mtd/octagon-5066.c
• Orig date: Mon Dec 11 14:57:58 2000

diff -u --recursive --new-file v2.4.1/linux/drivers/mtd/octagon-5066.c linux/drivers/mtd/octagon-5066.c
@@ -1,4 +1,4 @@
-// $Id: octagon-5066.c,v 1.12 2000/11/27 08:50:22 dwmw2 Exp $
+// $Id: octagon-5066.c,v 1.12.2.1 2001/02/15 10:12:48 dwmw2 Exp $
 /* ######################################################################
 
    Octagon 5066 MTD Driver. 
@@ -25,7 +25,7 @@
    ##################################################################### */
 
 #include <linux/module.h>
-#include <linux/malloc.h>
+#include <linux/slab.h>
 #include <linux/ioport.h>
 #include <linux/init.h>
 #include <asm/io.h>
@@ -273,7 +273,7 @@
 		}
 	}
 	
-	if (!oct5066_mtd[1] && !oct5066_mtd[2]) {
+	if (!oct5066_mtd[0] && !oct5066_mtd[1]) {
 		cleanup_oct5066();
 		return -ENXIO;
 	}