summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2013-11-07 08:31:47 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2013-11-07 08:31:47 +0100
commit398cdf212d43aac84909f42bd1cd2b376fc0140a (patch)
tree578f44177a49fabab3123de70e98974cf28d9221 /include
parent4bcff209bfb7782b55c3c8c44d61657f27ab52a3 (diff)
parent5f0bd3edc277bd2a435d60d1d36ea60738bc9c92 (diff)
downloadbarebox-398cdf212d43aac84909f42bd1cd2b376fc0140a.tar.gz
barebox-398cdf212d43aac84909f42bd1cd2b376fc0140a.tar.xz
Merge branch 'for-next/mtd'
Diffstat (limited to 'include')
-rw-r--r--include/linux/mtd/mtd.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index ed8722ea90..1735b49874 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -254,7 +254,7 @@ static inline uint32_t mtd_mod_by_eb(uint64_t sz, struct mtd_info *mtd)
}
/* Kernel-side ioctl definitions */
-extern int add_mtd_device(struct mtd_info *mtd, char *devname);
+extern int add_mtd_device(struct mtd_info *mtd, char *devname, int device_id);
extern int del_mtd_device (struct mtd_info *mtd);
extern struct mtd_info *get_mtd_device(struct mtd_info *mtd, int num);