diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-06-22 22:51:46 -0400 |
| commit | dbe1ab9514c231c9b062140a107d9dea0eabefcc (patch) | |
| tree | 0001c7143cf923fc704215f0a0e54221e9e5cbb9 /include/linux/mtd/inftl.h | |
| parent | 612eff0e3715a6faff5ba1b74873b99e036c59fe (diff) | |
| parent | d588fcbe5a7ba8bba2cebf7799ab2d573717a806 (diff) | |
| download | kernel_samsung_smdk4412-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.gz kernel_samsung_smdk4412-dbe1ab9514c231c9b062140a107d9dea0eabefcc.tar.bz2 kernel_samsung_smdk4412-dbe1ab9514c231c9b062140a107d9dea0eabefcc.zip | |
Merge branch 'master' into upstream
Diffstat (limited to 'include/linux/mtd/inftl.h')
| -rw-r--r-- | include/linux/mtd/inftl.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/mtd/inftl.h b/include/linux/mtd/inftl.h index d7eaa40e5ab..6977780e548 100644 --- a/include/linux/mtd/inftl.h +++ b/include/linux/mtd/inftl.h @@ -46,7 +46,7 @@ struct INFTLrecord { unsigned int nb_blocks; /* number of physical blocks */ unsigned int nb_boot_blocks; /* number of blocks used by the bios */ struct erase_info instr; - struct nand_oobinfo oobinfo; + struct nand_ecclayout oobinfo; }; int INFTL_mount(struct INFTLrecord *s); |