diff options
| author | Tony Lindgren <tony@atomide.com> | 2011-06-29 07:45:16 -0400 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2011-06-29 07:45:16 -0400 |
| commit | 48cb1258e8b0f8c81cfb699b42326c5b2147b3f8 (patch) | |
| tree | 6dc560f24eec8d303534d86b1e20d037df94a68d /arch/arm/mach-omap2/board-omap3pandora.c | |
| parent | 332acd9e534e0bc8713d2cb90dd2d4d5f2485401 (diff) | |
| parent | ec3cdb5baedf6bb3852c531426c1e95a13671dff (diff) | |
Merge branch 'for_3.1/pm-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-cleanup
Conflicts:
arch/arm/mach-omap2/pm-debug.c
arch/arm/mach-omap2/pm.h
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3pandora.c')
| -rw-r--r-- | arch/arm/mach-omap2/board-omap3pandora.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/mach-omap2/board-omap3pandora.c b/arch/arm/mach-omap2/board-omap3pandora.c index 47c426e8420a..d4ea9408560e 100644 --- a/arch/arm/mach-omap2/board-omap3pandora.c +++ b/arch/arm/mach-omap2/board-omap3pandora.c | |||
| @@ -84,7 +84,8 @@ static struct mtd_partition omap3pandora_nand_partitions[] = { | |||
| 84 | 84 | ||
| 85 | static struct omap_nand_platform_data pandora_nand_data = { | 85 | static struct omap_nand_platform_data pandora_nand_data = { |
| 86 | .cs = 0, | 86 | .cs = 0, |
| 87 | .devsize = 1, /* '0' for 8-bit, '1' for 16-bit device */ | 87 | .devsize = NAND_BUSWIDTH_16, |
| 88 | .xfer_type = NAND_OMAP_PREFETCH_DMA, | ||
| 88 | .parts = omap3pandora_nand_partitions, | 89 | .parts = omap3pandora_nand_partitions, |
| 89 | .nr_parts = ARRAY_SIZE(omap3pandora_nand_partitions), | 90 | .nr_parts = ARRAY_SIZE(omap3pandora_nand_partitions), |
| 90 | }; | 91 | }; |