summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorwdenk <wdenk>2003-09-11 19:48:06 +0000
committerwdenk <wdenk>2003-09-11 19:48:06 +0000
commita43278a43d522fba7fea0ed3045b718a9c8d22ac (patch)
treec21920a271992ce76e5e679c3e3e8bb11054d356 /include
parent7205e4075d8b50e4dd89fe39ed03860b23cbb704 (diff)
downloadu-boot-imx-a43278a43d522fba7fea0ed3045b718a9c8d22ac.zip
u-boot-imx-a43278a43d522fba7fea0ed3045b718a9c8d22ac.tar.gz
u-boot-imx-a43278a43d522fba7fea0ed3045b718a9c8d22ac.tar.bz2
* Patch by Gary Jennejohn, 11 Sep 2003:
- allow for longer timeouts for USB mass storage devices * Patch by Denis Peter, 11 Sep 2003: - fix USB data pointer assignment for bulk only transfer. - prevent to display erased directories in FAT filesystem. * Change output format for NAND flash - make it look like for other memory, too
Diffstat (limited to 'include')
-rw-r--r--include/linux/mtd/nand.h2
-rw-r--r--include/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index bb13431..af2033c 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -193,6 +193,6 @@ struct nand_flash_dev {
#define NAND_JFFS2_OOB8_FSDALEN 2
#define NAND_JFFS2_OOB16_FSDALEN 8
-void nand_probe(unsigned long physadr);
+unsigned long nand_probe(unsigned long physadr);
#endif /* __LINUX_MTD_NAND_H */
diff --git a/include/version.h b/include/version.h
index f0e19d5..ef22f7a 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,6 +24,6 @@
#ifndef __VERSION_H__
#define __VERSION_H__
-#define U_BOOT_VERSION "U-Boot 0.4.8"
+#define U_BOOT_VERSION "U-Boot 1.0.0-pre"
#endif /* __VERSION_H__ */