diff options
| author | Olof Johansson <olof@lixom.net> | 2012-10-01 14:07:32 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-10-01 14:07:32 -0700 |
| commit | 17a505edb09495510ac8998450980472c412455b (patch) | |
| tree | 07f3a9e512f67cffae1dde071c8247821dd17e60 /arch/arm/mach-nomadik/board-nhk8815.c | |
| parent | d9a807461fc8cc0d6ba589ea0730d139122af012 (diff) | |
| parent | b10dcdcac43b2b5adf800a19f782fef38ada75a1 (diff) | |
Merge branch 'next/fixes-non-critical' into HEAD
Diffstat (limited to 'arch/arm/mach-nomadik/board-nhk8815.c')
| -rw-r--r-- | arch/arm/mach-nomadik/board-nhk8815.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-nomadik/board-nhk8815.c b/arch/arm/mach-nomadik/board-nhk8815.c index f4535a7dadf5..c3841a9a8fa8 100644 --- a/arch/arm/mach-nomadik/board-nhk8815.c +++ b/arch/arm/mach-nomadik/board-nhk8815.c @@ -112,8 +112,7 @@ static struct mtd_partition nhk8815_partitions[] = { static struct nomadik_nand_platform_data nhk8815_nand_data = { .parts = nhk8815_partitions, .nparts = ARRAY_SIZE(nhk8815_partitions), - .options = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING \ - | NAND_NO_READRDY, + .options = NAND_COPYBACK | NAND_CACHEPRG | NAND_NO_PADDING, .init = nhk8815_nand_init, }; |