lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:
	drivers/mtd/nand/sh_flctl.c

Maxim's patch to initialise sysfs attributes depends on the patch which
actually adds sysfs_attr_init().
This commit is contained in:
David Woodhouse
2010-03-26 14:55:59 +00:00
parent 395b228858 220bf991b0
commit 329f9052db
8065 changed files with 531259 additions and 229930 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/mtd/nand/mxc_nand.c
View File

@@ -507,7 +507,7 @@ static void mxc_do_addr_cycle(struct mtd_info *mtd, int column, int page_addr)
* MXC NANDFC can only perform full page+spare or
* spare-only read/write. When the upper layers
* layers perform a read/write buf operation,
* we will used the saved column adress to index into
* we will used the saved column address to index into
* the full page.
*/
send_addr(host, 0, page_addr == -1);