diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-12-16 17:16:34 +0100 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-12-16 17:16:34 +0100 |
| commit | 7f202217356f19e519e6ec57a29de9af73067037 (patch) | |
| tree | 1c3fe822cc37bf4df09ac9ece94c8a71ab9a25d0 /include/linux/mtd | |
| parent | 6cdadcb3f1b6eac4a1c4256acaa1438413f95351 (diff) | |
| parent | 584eedab66d0828f2d571a24b10526c4e65f547b (diff) | |
| download | u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.zip u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.gz u-boot-imx-7f202217356f19e519e6ec57a29de9af73067037.tar.bz2 | |
Merge branch 'master' of ssh://gemini/home/wd/git/u-boot/master
Diffstat (limited to 'include/linux/mtd')
| -rw-r--r-- | include/linux/mtd/partitions.h | 6 | ||||
| -rw-r--r-- | include/linux/mtd/ubi.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/mtd/partitions.h b/include/linux/mtd/partitions.h index b41e5f5..1016675 100644 --- a/include/linux/mtd/partitions.h +++ b/include/linux/mtd/partitions.h @@ -76,9 +76,9 @@ struct device; struct device_node; int __devinit of_mtd_parse_partitions(struct device *dev, - struct mtd_info *mtd, - struct device_node *node, - struct mtd_partition **pparts); + struct mtd_info *mtd, + struct device_node *node, + struct mtd_partition **pparts); #endif #endif diff --git a/include/linux/mtd/ubi.h b/include/linux/mtd/ubi.h index a017891..4b3e06c 100644 --- a/include/linux/mtd/ubi.h +++ b/include/linux/mtd/ubi.h @@ -21,7 +21,7 @@ #ifndef __LINUX_UBI_H__ #define __LINUX_UBI_H__ -//#include <asm/ioctl.h> +/* #include <asm/ioctl.h> */ #include <linux/types.h> #include <mtd/ubi-user.h> |