Merge branch 'akpm' (patches from Andrew)

[cascardo/linux.git] / drivers / mtd / mtdpart.c

diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
index ec852fa..fccdd49 100644 (file)
--- a/drivers/mtd/mtdpart.c
+++ b/drivers/mtd/mtdpart.c
@@ -30,7 +30,6 @@
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/partitions.h>
 #include <linux/err.h>
-#include <linux/kconfig.h>
 
 #include "mtdcore.h"
 
@@ -409,6 +408,7 @@ static struct mtd_part *allocate_partition(struct mtd_info *master,
        slave->mtd.oobsize = master->oobsize;
        slave->mtd.oobavail = master->oobavail;
        slave->mtd.subpage_sft = master->subpage_sft;
+       slave->mtd.pairing = master->pairing;
 
        slave->mtd.name = name;
        slave->mtd.owner = master->owner;