summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-05-05 11:05:50 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-05-05 11:05:50 +0200
commit2274c6ea774aa167005fa4fe43419c5a18b531c8 (patch)
treeb3562085fa7efb2cf8274e735027bd380cf769f4 /include
parentd27b97820cffe2607ef5057df7897ce9aaee9099 (diff)
parent3781d93b06fddd9a5522e7ea7412e17693ece45c (diff)
downloadbarebox-2274c6ea774aa167005fa4fe43419c5a18b531c8.tar.gz
barebox-2274c6ea774aa167005fa4fe43419c5a18b531c8.tar.xz
Merge branch 'for-next/env'
Diffstat (limited to 'include')
-rw-r--r--include/envfs.h2
-rw-r--r--include/linux/mtd/mtd.h2
-rw-r--r--include/nand.h6
3 files changed, 8 insertions, 2 deletions
diff --git a/include/envfs.h b/include/envfs.h
index ae98808ede..9b86398984 100644
--- a/include/envfs.h
+++ b/include/envfs.h
@@ -110,8 +110,6 @@ static inline char *default_environment_path_get(void)
}
#endif
-int envfs_register_partition(const char *devname, unsigned int partnr);
-
#ifdef CONFIG_DEFAULT_ENVIRONMENT
void defaultenv_append(void *buf, unsigned int size, const char *name);
int defaultenv_load(const char *dir, unsigned flags);
diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h
index c63b514f44..5f02aee2d6 100644
--- a/include/linux/mtd/mtd.h
+++ b/include/linux/mtd/mtd.h
@@ -211,6 +211,8 @@ struct mtd_info {
struct device_d *parent;
struct cdev cdev;
+ struct cdev *cdev_bb;
+
struct param_d param_size;
char *size_str;
diff --git a/include/nand.h b/include/nand.h
index a0e77cc8cd..1da35d0ce8 100644
--- a/include/nand.h
+++ b/include/nand.h
@@ -7,6 +7,7 @@ struct nand_bb;
#ifdef CONFIG_NAND
int dev_add_bb_dev(const char *filename, const char *name);
int dev_remove_bb_dev(const char *name);
+struct cdev *mtd_add_bb(struct mtd_info *mtd, const char *name);
#else
static inline int dev_add_bb_dev(const char *filename, const char *name) {
return 0;
@@ -15,6 +16,11 @@ static inline int dev_remove_bb_dev(const char *name)
{
return 0;
}
+
+static inline struct cdev *mtd_add_bb(struct mtd_info *mtd, const char *name)
+{
+ return NULL;
+}
#endif
#endif /* __NAND_H__ */