* linux-next: manual merge of the mtd tree with the tree
@ 2009-12-03 1:15 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2009-12-03 1:15 UTC (permalink / raw)
To: David Woodhouse
Cc: linux-next, linux-kernel, Ralf Baechle, Uwe Kleine-König,
Artem Bityutskiy
[-- Attachment #1: Type: text/plain, Size: 503 bytes --]
Hi David,
Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/nand/excite_nandflash.c between commit
9e910a91b88d450951c849d12598645562acc4b2 ("MIPS: eXcite: Remove
platform") from the mips tree and commit
8fead79c96c68164372c47c7b3c79d2da0871c93 ("mtd: move excite_nand_remove
to .devexit.text") from the mtd tree.
The former just removed the file, so I did that.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
[-- Attachment #2: Type: application/pgp-signature, Size: 198 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
* linux-next: manual merge of the mtd tree with the tree
@ 2010-03-01 3:52 Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2010-03-01 3:52 UTC (permalink / raw)
To: David Woodhouse; +Cc: linux-next, linux-kernel, Magnus Damm
Hi David,
Today's linux-next merge of the mtd tree got a conflict in
drivers/mtd/nand/sh_flctl.c between commit
010ab820582d03bcd3648416b5837107e8a9c5f3 ("mtd: sh_flctl SHBUSSEL and
SEL_16BIT support") from Linus' tree and commit
5e81e88a4c140586d9212999cea683bcd66a15c6 ("mtd: nand: Allow caller to
pass alternative ID table to nand_scan_ident()") from the mtd tree.
Just context changes. I fixed it up (see below) and can carry the fix as
necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc drivers/mtd/nand/sh_flctl.c
index 1842df8,dbc09a8..0000000
--- a/drivers/mtd/nand/sh_flctl.c
+++ b/drivers/mtd/nand/sh_flctl.c
@@@ -849,12 -825,7 +849,12 @@@ static int __devinit flctl_probe(struc
nand->select_chip = flctl_select_chip;
nand->cmdfunc = flctl_cmdfunc;
+ if (pdata->flcmncr_val & SEL_16BIT) {
+ nand->options |= NAND_BUSWIDTH_16;
+ nand->read_word = flctl_read_word;
+ }
+
- ret = nand_scan_ident(flctl_mtd, 1);
+ ret = nand_scan_ident(flctl_mtd, 1, NULL);
if (ret)
goto err;
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-03-01 3:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-03-01 3:52 linux-next: manual merge of the mtd tree with the tree Stephen Rothwell
-- strict thread matches above, loose matches on Subject: below --
2009-12-03 1:15 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox