Merge branch 'master' of /home/tglx/work/mtd/git/linux-2.6.git/

[sfrench/cifs-2.6.git] / drivers / mtd / mtdchar.c

diff --git a/drivers/mtd/mtdchar.c b/drivers/mtd/mtdchar.c
index 4b3c6263e7fcdcf22a3481f1b3e096179a71d7fe..8c0d94b72b63671cae6c1aa51ab30bfa9957da96 100644 (file)
--- a/drivers/mtd/mtdchar.c
+++ b/drivers/mtd/mtdchar.c
@@ -13,6 +13,7 @@
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/fs.h>
 #include <linux/slab.h>
 #include <linux/init.h>
 #include <linux/fs.h>

+#include <linux/sched.h>       /* TASK_* */

 #include <asm/uaccess.h>
 
 #include <linux/device.h>
 #include <asm/uaccess.h>
 
 #include <linux/device.h>


@@ -24,10 +25,10 @@ static void mtd_notify_add(struct mtd_info* mtd)
        if (!mtd)
                return;
 
        if (!mtd)
                return;
 

-       class_device_create(mtd_class, MKDEV(MTD_CHAR_MAJOR, mtd->index*2),
+       class_device_create(mtd_class, NULL, MKDEV(MTD_CHAR_MAJOR, mtd->index*2),

                            NULL, "mtd%d", mtd->index);
        
                            NULL, "mtd%d", mtd->index);
        

-       class_device_create(mtd_class, 
+       class_device_create(mtd_class, NULL,

                            MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
                            NULL, "mtd%dro", mtd->index);
 }
                            MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
                            NULL, "mtd%dro", mtd->index);
 }