projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.infradead.org/mtd-2.6
[cascardo/linux.git]
/
drivers
/
mtd
/
nand
/
s3c2410.c
diff --git
a/drivers/mtd/nand/s3c2410.c
b/drivers/mtd/nand/s3c2410.c
index
68b5b3a
..
fa6e9c7
100644
(file)
--- a/
drivers/mtd/nand/s3c2410.c
+++ b/
drivers/mtd/nand/s3c2410.c
@@
-774,7
+774,7
@@
static void s3c2410_nand_init_chip(struct s3c2410_nand_info *info,
chip->select_chip = s3c2410_nand_select_chip;
chip->chip_delay = 50;
chip->priv = nmtd;
- chip->options =
0
;
+ chip->options =
set->options
;
chip->controller = &info->controller;
switch (info->cpu_type) {