diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-12-15 17:13:26 -0500 |
| commit | 7e1548a597ef7e26d5d62f8be3be6da9e101b26c (patch) | |
| tree | fe6cbf4d9a3c1afdba04fb276fef0f932403727c /drivers/mtd/nand/pxa3xx_nand.c | |
| parent | 1f7f569c0ae6e619504095eabf796edd712d943d (diff) | |
| parent | 2619bc327417f549f1c89d5ef9b4a4aa768f41a2 (diff) | |
Merge branch 'omap3-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap-2.6 into devel
Diffstat (limited to 'drivers/mtd/nand/pxa3xx_nand.c')
| -rw-r--r-- | drivers/mtd/nand/pxa3xx_nand.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c index ce5752ab579d..fc4144495610 100644 --- a/drivers/mtd/nand/pxa3xx_nand.c +++ b/drivers/mtd/nand/pxa3xx_nand.c | |||
| @@ -269,6 +269,7 @@ static struct pxa3xx_nand_timing stm2GbX16_timing = { | |||
| 269 | 269 | ||
| 270 | static struct pxa3xx_nand_flash stm2GbX16 = { | 270 | static struct pxa3xx_nand_flash stm2GbX16 = { |
| 271 | .timing = &stm2GbX16_timing, | 271 | .timing = &stm2GbX16_timing, |
| 272 | .cmdset = &largepage_cmdset, | ||
| 272 | .page_per_block = 64, | 273 | .page_per_block = 64, |
| 273 | .page_size = 2048, | 274 | .page_size = 2048, |
| 274 | .flash_width = 16, | 275 | .flash_width = 16, |