summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-06-03 00:16:48 +0200
committerWolfgang Denk <wd@denx.de>2008-06-03 00:16:48 +0200
commit7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc (patch)
tree5ba2f3b891a37f5e9beef2710ef2f82bdbf5f0e4 /include
parente3d0d4ac0ec900543bdda141f9ada9bf6c47d011 (diff)
parentd6ac2ed893c2168738aee01579d6283af8d37045 (diff)
downloadu-boot-imx-7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc.zip
u-boot-imx-7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc.tar.gz
u-boot-imx-7feb4d38ff1fdf8877f39447001ff9f6e93fa6bc.tar.bz2
Merge remote branch 'u-boot-nand-flash/master'
Diffstat (limited to 'include')
-rw-r--r--include/linux/mtd/nand.h4
-rw-r--r--include/onenand_uboot.h5
2 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/mtd/nand.h b/include/linux/mtd/nand.h
index 4cc4a7d..e2a25a6 100644
--- a/include/linux/mtd/nand.h
+++ b/include/linux/mtd/nand.h
@@ -385,6 +385,10 @@ struct nand_manufacturers {
extern struct nand_flash_dev nand_flash_ids[];
extern struct nand_manufacturers nand_manuf_ids[];
+#ifndef NAND_MAX_CHIPS
+#define NAND_MAX_CHIPS 8
+#endif
+
/**
* struct nand_bbt_descr - bad block table descriptor
* @options: options for this descriptor
diff --git a/include/onenand_uboot.h b/include/onenand_uboot.h
index bd1831e..4449f98 100644
--- a/include/onenand_uboot.h
+++ b/include/onenand_uboot.h
@@ -14,6 +14,8 @@
#ifndef __UBOOT_ONENAND_H
#define __UBOOT_ONENAND_H
+#include <linux/types.h>
+
struct kvec {
void *iov_base;
size_t iov_len;
@@ -22,6 +24,9 @@ struct kvec {
typedef int spinlock_t;
typedef int wait_queue_head_t;
+struct mtd_info;
+struct erase_info;
+
/* Functions */
extern void onenand_init(void);
extern int onenand_read(struct mtd_info *mtd, loff_t from, size_t len,