diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-21 02:46:21 +0200 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-21 02:46:21 +0200 |
| commit | 70ac4385a13f78bc478f26d317511893741b05bd (patch) | |
| tree | dafc7f3018295fc4ee00339889e4f35d5b9d7743 /include/mtd/mtd-user.h | |
| parent | Merge branch 'master' of /home/trondmy/kernel/linux-2.6/ (diff) | |
| parent | Merge branch 'rio.b19' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/... (diff) | |
| download | linux-70ac4385a13f78bc478f26d317511893741b05bd.tar.xz linux-70ac4385a13f78bc478f26d317511893741b05bd.zip | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
include/linux/nfs_fs.h
Fixed up conflict with kernel header updates.
Diffstat (limited to 'include/mtd/mtd-user.h')
| -rw-r--r-- | include/mtd/mtd-user.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/mtd/mtd-user.h b/include/mtd/mtd-user.h index 1c13fc7161fe..713f34d3e62e 100644 --- a/include/mtd/mtd-user.h +++ b/include/mtd/mtd-user.h @@ -16,5 +16,6 @@ typedef struct mtd_info_user mtd_info_t; typedef struct erase_info_user erase_info_t; typedef struct region_info_user region_info_t; typedef struct nand_oobinfo nand_oobinfo_t; +typedef struct nand_ecclayout nand_ecclayout_t; #endif /* __MTD_USER_H__ */ |