diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/mtd/nand.h | 2 | ||||
| -rw-r--r-- | include/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h index bb13431dd8..af2033c5b2 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 f0e19d5bf2..ef22f7ac0a 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__ */ |