summaryrefslogtreecommitdiff
path: root/include/linux/mtd/physmap.h
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2012-01-12 13:11:43 +0900
committerPaul Mundt <lethal@linux-sh.org>2012-01-12 13:11:43 +0900
commitb1bdd255661369cb6eb90b6e181169b5e6d0f9b6 (patch)
tree17d15f3a6dc5bdd6205070dbef0e339421b13d25 /include/linux/mtd/physmap.h
parent9d14070f656addddce3d63fd483de46930b51850 (diff)
parentc1537b4863da620f12f5b42ece61bf65314148ed (diff)
downloadlinux-next-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.tar.gz
linux-next-b1bdd255661369cb6eb90b6e181169b5e6d0f9b6.zip
Merge branch 'sh/nommu' into sh-latest
Diffstat (limited to 'include/linux/mtd/physmap.h')
-rw-r--r--include/linux/mtd/physmap.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/mtd/physmap.h b/include/linux/mtd/physmap.h
index 04e018160e2b..d2887e76b7f6 100644
--- a/include/linux/mtd/physmap.h
+++ b/include/linux/mtd/physmap.h
@@ -30,6 +30,7 @@ struct physmap_flash_data {
unsigned int pfow_base;
char *probe_type;
struct mtd_partition *parts;
+ const char **part_probe_types;
};
#endif /* __LINUX_MTD_PHYSMAP__ */