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

This commit is contained in:
Thomas Gleixner
2005-11-06 15:36:37 +01:00
7316 changed files with 540452 additions and 288420 deletions

View File

@@ -13,6 +13,7 @@
#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>
@@ -24,10 +25,10 @@ static void mtd_notify_add(struct mtd_info* mtd)
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);
class_device_create(mtd_class,
class_device_create(mtd_class, NULL,
MKDEV(MTD_CHAR_MAJOR, mtd->index*2+1),
NULL, "mtd%dro", mtd->index);
}